diff options
| -rw-r--r-- | src/beingmanager.cpp | 6 | ||||
| -rw-r--r-- | src/engine.cpp | 3 | ||||
| -rw-r--r-- | src/net/playerhandler.cpp | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp index e5836aa7..a3fb14ff 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -107,9 +107,8 @@ Being *BeingManager::findBeing(int id) for (BeingIterator i = mBeings.begin(); i != mBeings.end(); i++) { Being *being = (*i); - if (being->getId() == id) { + if (being->getId() == id) return being; - } } return NULL; } @@ -182,7 +181,8 @@ void BeingManager::logic() delete being; i = mBeings.erase(i); } - else { + else + { i++; } } diff --git a/src/engine.cpp b/src/engine.cpp index cc19bd72..8ef2b9c6 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -66,6 +66,8 @@ void Engine::changeMap(const std::string &mapPath) particleEngine->clear(); + mMapName = mapPath; + // Store full map path in global var map_path = "maps/" + mapPath.substr(0, mapPath.rfind(".")) + ".tmx"; ResourceManager *resman = ResourceManager::getInstance(); @@ -128,7 +130,6 @@ void Engine::changeMap(const std::string &mapPath) sound.playMusic(newMusic, -1); mCurrentMap = newMap; - mMapName = mapPath; // Send "map loaded" MessageOut outMsg(mNetwork); diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index 60d58a37..9afbc5f0 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -164,9 +164,8 @@ void PlayerHandler::handleMessage(MessageIn *msg) player_node->mX = x; player_node->mY = y; - logger->log("Adjust scrolling by %d:%d", - (int) scrollOffsetX, - (int) scrollOffsetY); + logger->log("Adjust scrolling by %d:%d", (int) scrollOffsetX, + (int) scrollOffsetY); viewport->scrollBy(scrollOffsetX, scrollOffsetY); } |