2 files changed, 18 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 40b30899..3c98ed27 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -159,6 +159,7 @@ extern Net::Connection *accountServerConnection;
 #endif
 
 Graphics *graphics;
+Game *game = 0;
 
 unsigned char state;
 std::string errorMessage;
@@ -214,6 +215,7 @@ struct Options
     std::string configPath;
     std::string updateHost;
     std::string dataPath;
+    std::string homeDir;
 
     std::string serverName;
     short serverPort;
@@ -302,11 +304,16 @@ static void setUpdatesDir()
  * Initializes the home directory. On UNIX and FreeBSD, ~/.tmw is used. On
  * Windows and other systems we use the current working directory.
  */
-static void initHomeDir()
+static void initHomeDir(const Options &options)
 {
-    homeDir = std::string(PHYSFS_getUserDir()) +
-        "/." +
-        branding.getValue("appShort", "tmw");
+    homeDir = options.homeDir;
+    
+    if (homeDir.empty())
+    {
+	    homeDir = std::string(PHYSFS_getUserDir()) +
+            "/." +
+	        branding.getValue("appShort", "tmw");
+    }
 #if defined WIN32
     if (!CreateDirectory(homeDir.c_str(), 0) &&
             GetLastError() != ERROR_ALREADY_EXISTS)
@@ -659,7 +666,7 @@ static void parseOptions(int argc, char *argv[], Options &options)
                 options.printVersion = true;
                 break;
             case 'S':
-                homeDir = optarg;
+                options.homeDir = optarg;
                 break;
             case 'O':
                 options.noOpenGL = true;
@@ -893,7 +900,7 @@ int main(int argc, char *argv[])
     // Load branding information
     branding.init("data/branding.xml");
 
-    initHomeDir();
+    initHomeDir(options);
 
     // Configure logger
     logger = new Logger;
@@ -910,7 +917,6 @@ int main(int argc, char *argv[])
     // Needs to be created in main, as the updater uses it
     guiPalette = new Palette;
 
-    Game *game = NULL;
     Window *currentDialog = NULL;
 #ifdef TMWSERV_SUPPORT
     QuitDialog* quitDialog = NULL;
@@ -1290,6 +1296,7 @@ int main(int argc, char *argv[])
                     game = new Game;
                     game->logic();
                     delete game;
+                    game = 0;
 
                     state = STATE_EXIT;
 
@@ -1467,9 +1474,9 @@ int main(int argc, char *argv[])
                     desktop = NULL;
 
                     logger->log("State: GAME");
-                    game = new Game;
                     game->logic();
                     delete game;
+                    game = 0;
                     state = STATE_EXIT;
                     break;
 
diff --git a/src/net/ea/maphandler.cpp b/src/net/ea/maphandler.cpp
index 76b3c480..c7ff0ec7 100644
--- a/src/net/ea/maphandler.cpp
+++ b/src/net/ea/maphandler.cpp
@@ -27,6 +27,7 @@
 #include "net/messagein.h"
 #include "net/messageout.h"
 
+#include "game.h"
 #include "localplayer.h"
 #include "log.h"
 #include "main.h"
@@ -37,6 +38,7 @@
 #include "utils/stringutils.h"
 
 Net::MapHandler *mapHandler;
+extern Game *game;
 
 namespace EAthena {
 
@@ -65,6 +67,7 @@ void MapHandler::handleMessage(MessageIn &msg)
             logger->log("Protocol: Player start position: (%d, %d), Direction: %d",
                     player_node->mX, player_node->mY, direction);
             state = STATE_GAME;
+            game = new Game;
             break;
 
         case SMSG_SERVER_PING: