X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FMacCompatibility.cpp;h=272288a639b09da4b3fd4551d9db6f5e2a8b66be;hb=cd043e3f9e26c2b3406b40a354c2840941e9db7f;hp=4260bddcabf1ad58bbe6b3241a2fbf35a87d87b7;hpb=9b2b1b257c8e3f01c4c414fbaab03f59284eef03;p=lugaru.git diff --git a/Source/MacCompatibility.cpp b/Source/MacCompatibility.cpp index 4260bdd..272288a 100644 --- a/Source/MacCompatibility.cpp +++ b/Source/MacCompatibility.cpp @@ -3,20 +3,18 @@ Copyright (C) 2003, 2010 - Wolfire Games This file is part of Lugaru. -Lugaru is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. +Lugaru is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. -This program is distributed in the hope that it will be useful, +Lugaru is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with Lugaru. If not, see . */ #if !PLATFORM_MACOSX @@ -62,83 +60,79 @@ static int QueryPerformanceCounter(LARGE_INTEGER *liptr) class AppTime { public: - AppTime() - { - counterRate = 1; - baseCounter = 0; - QueryPerformanceFrequency( (LARGE_INTEGER*)&counterRate); - QueryPerformanceCounter( (LARGE_INTEGER*)&baseCounter); - } - __int64 counterRate; // LARGE_INTEGER type has no math functions so use int64 - __int64 baseCounter; + AppTime() { + counterRate = 1; + baseCounter = 0; + QueryPerformanceFrequency( (LARGE_INTEGER*)&counterRate); + QueryPerformanceCounter( (LARGE_INTEGER*)&baseCounter); + } + __int64 counterRate; // LARGE_INTEGER type has no math functions so use int64 + __int64 baseCounter; }; static AppTime g_appTime; void CopyCStringToPascal( const char* src, unsigned char dst[256]) { - int len = strlen( src); - dst[ 0] = len; - memcpy( dst + 1, src, len); + int len = strlen( src); + dst[ 0] = len; + memcpy( dst + 1, src, len); } void CopyPascalStringToC( const unsigned char* src, char* dst) { - int len = src[ 0]; - memcpy( dst, src + 1, len); - dst[ len] = 0; + int len = src[ 0]; + memcpy( dst, src + 1, len); + dst[ len] = 0; } AbsoluteTime UpTime() { - __int64 counter; - QueryPerformanceCounter( (LARGE_INTEGER*)&counter); + __int64 counter; + QueryPerformanceCounter( (LARGE_INTEGER*)&counter); - counter -= g_appTime.baseCounter; + counter -= g_appTime.baseCounter; - AbsoluteTime time; - time.lo = (unsigned long)counter; - time.hi = (unsigned long)(counter >> 32); - return time; + AbsoluteTime time; + time.lo = (unsigned long)counter; + time.hi = (unsigned long)(counter >> 32); + return time; } Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b) { - __int64 value = a.hi; - value <<= 32; - value |= a.lo; - __int64 value2 = b.hi; - value2 <<= 32; - value2 |= b.lo; - value -= value2; - - if (value <= 0) - return durationImmediate; - - __int64 frac = value % g_appTime.counterRate; - value /= g_appTime.counterRate; - - Duration time; - - if (value == 0) - { - frac *= -1000000; - frac /= g_appTime.counterRate; - time = (Duration)frac; - } - else - { - frac *= 1000; - frac /= g_appTime.counterRate; - value *= 1000; - value += frac; - time = (Duration)value; - } - - return time; + __int64 value = a.hi; + value <<= 32; + value |= a.lo; + __int64 value2 = b.hi; + value2 <<= 32; + value2 |= b.lo; + value -= value2; + + if (value <= 0) + return durationImmediate; + + __int64 frac = value % g_appTime.counterRate; + value /= g_appTime.counterRate; + + Duration time; + + if (value == 0) { + frac *= -1000000; + frac /= g_appTime.counterRate; + time = (Duration)frac; + } else { + frac *= 1000; + frac /= g_appTime.counterRate; + value *= 1000; + value += frac; + time = (Duration)value; + } + + return time; } @@ -154,8 +148,6 @@ Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b) static int locateOneElement(char *buf) { char *ptr; - char **rc; - char **i; DIR *dirp; //if (PHYSFS_exists(buf)) @@ -163,13 +155,11 @@ static int locateOneElement(char *buf) return(1); /* quick rejection: exists in current case. */ ptr = strrchr(buf, '/'); /* find entry at end of path. */ - if (ptr == NULL) - { + if (ptr == NULL) { dirp = opendir("."); ptr = buf; } /* if */ - else - { + else { *ptr = '\0'; dirp = opendir(buf); *ptr = '/'; @@ -177,10 +167,8 @@ static int locateOneElement(char *buf) } /* else */ struct dirent *dent; - while ((dent = readdir(dirp)) != NULL) - { - if (strcasecmp(dent->d_name, ptr) == 0) - { + while ((dent = readdir(dirp)) != NULL) { + if (strcasecmp(dent->d_name, ptr) == 0) { strcpy(ptr, dent->d_name); /* found a match. Overwrite with this case. */ closedir(dirp); return(1); @@ -205,8 +193,7 @@ static inline const char *getUserDirByUID(void) static inline const char *getPrefPath(void) { static char *prefpath = NULL; - if (prefpath == NULL) - { + if (prefpath == NULL) { const char *homedir = getenv("HOME"); if (homedir == NULL) homedir = getUserDirByUID(); @@ -232,16 +219,13 @@ static int locateCorrectCase(char *buf, bool makedirs) char *prevptr; ptr = prevptr = buf; - while (ptr = strchr(ptr + 1, '/')) - { + while (ptr = strchr(ptr + 1, '/')) { *ptr = '\0'; /* block this path section off */ rc = locateOneElement(buf); - if (!rc) - { + if (!rc) { if (makedirs) /* normal if we're writing; build dirs! */ mkdir(buf, S_IRWXU); - else - { + else { *ptr = '/'; /* restore path separator */ return(-2); /* missing element in path. */ } /* else */ @@ -277,32 +261,31 @@ static int locateCorrectFile(char *buf, const char *mode) } /* locateCorrectFile */ #endif -// Dummified the function + static char g_filename[4096]; char* ConvertFileName( const char* orgfilename, const char *mode) { if (orgfilename == g_filename) // recursion? return g_filename; - // translate filename into proper path name - if (orgfilename[ 0] == ':') - orgfilename++; - strcpy( g_filename, orgfilename); + // translate filename into proper path name + if (orgfilename[ 0] == ':') + orgfilename++; + strcpy( g_filename, orgfilename); - for (int n = 0; g_filename[ n]; n++) - { - if (g_filename[ n] == ':') - g_filename[ n] = '/'; + for (int n = 0; g_filename[ n]; n++) { + if (g_filename[ n] == ':') + g_filename[ n] = '/'; - else if (g_filename[ n] == '\\') - g_filename[ n] = '/'; - } + else if (g_filename[ n] == '\\') + g_filename[ n] = '/'; + } - #if PLATFORM_UNIX +#if PLATFORM_UNIX locateCorrectFile(g_filename, mode); - #endif +#endif - return g_filename; + return g_filename; } #endif