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/game.cpp | |
| parent | 56c224050f10d976298cef98607aa3b3e56fcc99 (diff) | |
| parent | 3d85a00ff2a33e22ba63d0b7dfc156d8076933e1 (diff) | |
| download | mana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.gz mana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.bz2 mana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.xz mana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp index 750725db..2ee4ad13 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -41,6 +41,7 @@ #include "keyboardconfig.h" #include "localplayer.h" #include "log.h" +#include "map.h" #include "npc.h" #include "particle.h" #include "player_relations.h" @@ -95,8 +96,6 @@ #include "utils/gettext.h" -class Map; - std::string map_path; bool done = false; @@ -473,6 +472,9 @@ void Game::logic() while (!done) { + if (Map *map = engine->getCurrentMap()) + map->update(get_elapsed_time(gameTime)); + // Handle all necessary game logic while (get_elapsed_time(gameTime) > 0) { |