diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-04-15 13:10:38 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-04-15 13:10:38 -0600 |
| commit | e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701 (patch) | |
| tree | 6c9218f32675f9d401301172869c30488ab08b16 /src/engine.cpp | |
| parent | 56c224050f10d976298cef98607aa3b3e56fcc99 (diff) | |
| parent | 3d85a00ff2a33e22ba63d0b7dfc156d8076933e1 (diff) | |
| download | mana-client-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.gz mana-client-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.bz2 mana-client-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.xz mana-client-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/engine.cpp')
| -rw-r--r-- | src/engine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/engine.cpp b/src/engine.cpp index 95f2cb1b..a0e475f6 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -58,6 +58,10 @@ bool Engine::changeMap(const std::string &mapPath) floorItemManager->clear(); beingManager->clear(); + // Close the popup menu on map change so that invalid options can't be + // executed. + viewport->closePopupMenu(); + // Unset the map of the player so that its particles are cleared before // being deleted in the next step if (player_node) @@ -144,7 +148,5 @@ void Engine::logic() { beingManager->logic(); particleEngine->update(); - if (mCurrentMap) - mCurrentMap->update(); gui->logic(); } |