diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-03-08 14:49:14 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-03-08 14:49:14 +0000 |
| commit | 61536d859c62518718d17e82e21b3a2459de3410 (patch) | |
| tree | ecf992d7334f2bd9c035a1043c22cf0225b0d6f1 /src/gui/gui.cpp | |
| parent | 8f375a38ad972a1fcac7953cc0d254313c88b7c9 (diff) | |
| download | mana-61536d859c62518718d17e82e21b3a2459de3410.tar.gz mana-61536d859c62518718d17e82e21b3a2459de3410.tar.bz2 mana-61536d859c62518718d17e82e21b3a2459de3410.tar.xz mana-61536d859c62518718d17e82e21b3a2459de3410.zip | |
Reverted changes from r2225, it broke walking code as I missed the differences between tile and being collisions.
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index af9a1281..b52ff8e8 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -48,6 +48,7 @@ #include "../localplayer.h" #include "../log.h" #include "../main.h" +#include "../map.h" #include "../npc.h" #include "../resources/image.h" @@ -256,8 +257,7 @@ Gui::mousePress(int mx, int my, int button) Being *being; FloorItem *floorItem; - if ((being = beingManager->findBeing(tilex, tiley)) - && being->getType() != Being::LOCALPLAYER) + if ((being = beingManager->findBeing(tilex, tiley)) && being->getType() != Being::LOCALPLAYER) { showPopup(mx, my, being); return; @@ -310,7 +310,7 @@ Gui::mousePress(int mx, int my, int button) player_node->pickUp(item); } // Just walk around - else + else if (engine->getCurrentMap()->getWalk(tilex, tiley)) { // XXX XXX XXX REALLY UGLY! Uint8 *keys = SDL_GetKeyState(NULL); |