summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-01-04 02:20:38 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-01-04 02:20:38 +0000
commit4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac (patch)
tree0b18ed6970f8fdd6750459e6f9032e444d253580 /src/game.cpp
parente160ba567bf3d2ae915e67c12c13e213c1a32a62 (diff)
downloadmana-4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac.tar.gz
mana-4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac.tar.bz2
mana-4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac.tar.xz
mana-4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac.zip
Merged 0.0 changes from revision 2898 to 2988 to trunk.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index f708fabf..2af13146 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -360,7 +360,7 @@ void Game::logic()
get_elapsed_time(mDrawTime / 10) > mMinFrameTime)
{
frame++;
- engine->draw(graphics);
+ gui->draw();
graphics->updateScreen();
mDrawTime += mMinFrameTime;
@@ -662,7 +662,7 @@ void Game::handleInput()
direction |= Being::RIGHT;
}
- player_node->walk(direction);
+ player_node->setWalkingDir(direction);
// Target the nearest monster if 'a' pressed
if (keys[SDLK_a])