Mention world location at server startup at action level

[dragonfireclient.git] / src / porting.h

diff --git a/src/porting.h b/src/porting.h
index 3f9486b63fb1fda9b14afafe5e8e2347e99f17a1..05a6ae0c462b418295ff86eb70042963d45b353f 100644 (file)
--- a/src/porting.h
+++ b/src/porting.h
@@ -59,7 +59,7 @@ bool * signal_handler_killstatus(void);
 /*
        Path of static data directory.
 */
-extern std::string path_data;
+extern std::string path_share;
 
 /*
        Directory for storing user data. Examples:
@@ -67,19 +67,16 @@ extern std::string path_data;
        Linux: "~/.<PROJECT_NAME>"
        Mac: "~/Library/Application Support/<PROJECT_NAME>"
 */
-extern std::string path_userdata;
+extern std::string path_user;
 
 /*
        Get full path of stuff in data directory.
        Example: "stone.png" -> "../data/stone.png"
 */
-inline std::string getDataPath(const char *subpath)
-{
-       return path_data + "/" + subpath;
-}
+std::string getDataPath(const char *subpath);
 
 /*
-       Initialize path_data and path_userdata.
+       Initialize path_share and path_user.
 */
 void initializePaths();