Changeset 2759 for code/trunk/src/core/Core.cc

Timestamp:

Mar 8, 2009, 4:51:27 PM (15 years ago)

Author:

scheusso

Message:

merged network branch (windows,multiplayer fixes) back to trunk

File:

• code/trunk/src/core/Core.cc (modified) (4 diffs)

code/trunk/src/core/Core.cc

@@ -260 +260 @@
     /*static*/ std::string Core::getMediaPathString()
     {
-        return mediaPath_g.directory_string() + CP_SLASH;
-    }
-    /*static*/ std::string Core::getMediaPathPOSIXString()
-    {
         return mediaPath_g.string() + '/';
-
     }
 
@@ -274 +269 @@
     /*static*/ std::string Core::getConfigPathString()
     {
-        return configPath_g.directory_string() + CP_SLASH;
-    }
-    /*static*/ std::string Core::getConfigPathPOSIXString()
-    {
         return configPath_g.string() + '/';
     }
@@ -286 +277 @@
     }
     /*static*/ std::string Core::getLogPathString()
-    {
-        return logPath_g.directory_string() + CP_SLASH;
-    }
-    /*static*/ std::string Core::getLogPathPOSIXString()
     {
         return logPath_g.string() + '/';
@@ -456 +443 @@
             {
                 ThrowException(General, std::string("The ") + it->second + " directory has been preoccupied by a file! \
-                                         Please remove " + it->first.file_string());
+                                         Please remove " + it->first.string());
             }
             if (boost::filesystem::create_directories(it->first)) // function may not return true at all (bug?)