diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-27 16:24:01 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-27 16:24:01 -0600 |
| commit | f67237cb69599753192c301f0f2eb38b88f7b57a (patch) | |
| tree | a38b31447423e7971601f8a7e9528d204d7fcc26 /src/engine.cpp | |
| parent | 60f10c242fc4f99b0ab0f8d8c6d4b4acde0022cd (diff) | |
| download | mana-f67237cb69599753192c301f0f2eb38b88f7b57a.tar.gz mana-f67237cb69599753192c301f0f2eb38b88f7b57a.tar.bz2 mana-f67237cb69599753192c301f0f2eb38b88f7b57a.tar.xz mana-f67237cb69599753192c301f0f2eb38b88f7b57a.zip | |
Clean up some ifdefs and start cleanup of parties
Diffstat (limited to 'src/engine.cpp')
| -rw-r--r-- | src/engine.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/engine.cpp b/src/engine.cpp index d13fbf3f..04d06e38 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -33,11 +33,6 @@ #include "gui/minimap.h" #include "gui/viewport.h" -#ifdef EATHENA_SUPPORT -#include "net/messageout.h" -#include "net/ea/protocol.h" -#endif - #include "resources/mapreader.h" #include "resources/monsterdb.h" #include "resources/resourcemanager.h" @@ -54,7 +49,7 @@ Engine::~Engine() delete mCurrentMap; } -void Engine::changeMap(const std::string &mapPath) +bool Engine::changeMap(const std::string &mapPath) { // Clean up floor items, beings and particles floorItemManager->clear(); @@ -71,11 +66,7 @@ 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"; @@ -143,10 +134,7 @@ void Engine::changeMap(const std::string &mapPath) mCurrentMap = newMap; -#ifdef EATHENA_SUPPORT - // Send "map loaded" - MessageOut outMsg(CMSG_MAP_LOADED); -#endif + return true; } void Engine::logic() |