1 files changed, 26 insertions, 5 deletions

diff --git a/src/engine.cpp b/src/engine.cpp
index 8ef2b9c6..da4eb336 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,17 +33,25 @@
 #include "gui/minimap.h"
 #include "gui/viewport.h"
 
+#ifdef EATHENA_SUPPORT
 #include "net/messageout.h"
-#include "net/protocol.h"
+#include "net/ea/protocol.h"
+#endif
 
 #include "resources/mapreader.h"
+#include "resources/monsterdb.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/stringutils.h"
 
+#ifdef TMWSERV_SUPPORT
+Engine::Engine():
+    mCurrentMap(NULL)
+#else
 Engine::Engine(Network *network):
     mCurrentMap(NULL),
     mNetwork(network)
+#endif
 {
 }
 
@@ -58,6 +65,7 @@ void Engine::changeMap(const std::string &mapPath)
     // Clean up floor items, beings and particles
     floorItemManager->clear();
     beingManager->clear();
+    particleEngine->clear();
 
     // Unset the map of the player so that its particles are cleared before
     // being deleted in the next step
@@ -69,7 +77,11 @@ void Engine::changeMap(const std::string &mapPath)
     mMapName = mapPath;
 
     // Store full map path in global var
+#ifdef TMWSERV_SUPPORT
+    map_path = "maps/" + mapPath + ".tmx";
+#else
     map_path = "maps/" + mapPath.substr(0, mapPath.rfind(".")) + ".tmx";
+#endif
     ResourceManager *resman = ResourceManager::getInstance();
     if (!resman->exists(map_path))
         map_path += ".gz";
@@ -107,6 +119,12 @@ void Engine::changeMap(const std::string &mapPath)
         else
              minimap->setProportion(0.5);
     }
+    if (newMap->hasProperty("name"))
+    {
+        minimap->setCaption(newMap->getProperty("name"));
+    } else {
+        minimap->setCaption("Map");
+    }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
     particleEngine->setMap(newMap);
@@ -131,15 +149,18 @@ void Engine::changeMap(const std::string &mapPath)
 
     mCurrentMap = newMap;
 
+#ifdef EATHENA_SUPPORT
     // Send "map loaded"
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_MAP_LOADED);
+#endif
 }
 
 void Engine::logic()
 {
     beingManager->logic();
     particleEngine->update();
-    mCurrentMap->update();
+    if (mCurrentMap)
+        mCurrentMap->update();
     gui->logic();
 }