Switched all data access to the new methods

[lugaru.git] / Source / MacCompatibility.cpp

diff --git a/Source/MacCompatibility.cpp b/Source/MacCompatibility.cpp
index dca10d83bfb11b49950fbb05318e0ab1d42842d2..1777791269b6c84a174e369cbbc5b881bb57844d 100644 (file)
--- a/Source/MacCompatibility.cpp
+++ b/Source/MacCompatibility.cpp
@@ -1,26 +1,23 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 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 <http://www.gnu.org/licenses/>.
 */
 
-#if !PLATFORM_MACOSX
-
 /**> HEADER FILES <**/
 #include "MacCompatibility.h"
 
@@ -73,23 +70,6 @@ public:
 };
 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);
-}
-
-
-void CopyPascalStringToC( const unsigned char* src, char* dst)
-{
-    int len = src[ 0];
-    memcpy( dst, src + 1, len);
-    dst[ len] = 0;
-}
-
-
 AbsoluteTime UpTime()
 {
     __int64 counter;
@@ -152,7 +132,6 @@ static int locateOneElement(char *buf)
     char *ptr;
     DIR *dirp;
 
-    //if (PHYSFS_exists(buf))
     if (access(buf, F_OK) == 0)
         return(1);  /* quick rejection: exists in current case. */
 
@@ -217,10 +196,8 @@ static inline const char *getPrefPath(void)
 static int locateCorrectCase(char *buf, bool makedirs)
 {
     int rc;
-    char *ptr;
-    char *prevptr;
+    char *ptr = buf;
 
-    ptr = prevptr = buf;
     while (ptr = strchr(ptr + 1, '/')) {
         *ptr = '\0';  /* block this path section off */
         rc = locateOneElement(buf);
@@ -262,34 +239,3 @@ static int locateCorrectFile(char *buf, const char *mode)
     return(rc);
 } /* locateCorrectFile */
 #endif
-
-
-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);
-
-    for (int n = 0; g_filename[ n]; n++) {
-        if (g_filename[ n] == ':')
-            g_filename[ n] = '/';
-
-        else if (g_filename[ n] == '\\')
-            g_filename[ n] = '/';
-    }
-
-#if PLATFORM_UNIX
-    locateCorrectFile(g_filename, mode);
-#endif
-
-    return g_filename;
-}
-
-#endif
-
-