diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-05 14:57:35 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-05 14:57:35 +0000 |
| commit | de61b658590630cfc59960c012c8e533b361a8b0 (patch) | |
| tree | b89a6f23a385ea4a7d32e3abc6ce4a82114c5d67 /src/gui/gui.cpp | |
| parent | dbca3013575b766a681d1cea946e249a386e2144 (diff) | |
| parent | 482f0ddb85487bd5a4beaf2706cca9f690aa9304 (diff) | |
| download | mana-de61b658590630cfc59960c012c8e533b361a8b0.tar.gz mana-de61b658590630cfc59960c012c8e533b361a8b0.tar.bz2 mana-de61b658590630cfc59960c012c8e533b361a8b0.tar.xz mana-de61b658590630cfc59960c012c8e533b361a8b0.zip | |
Moved 0.1.0 branch to trunk. A new beginning.
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index b7f64274..38b17781 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -55,6 +55,9 @@ #include "../resources/image.h" #include "../resources/resourcemanager.h" #include "../resources/sdlimageloader.h" +#ifdef USE_OPENGL +#include "../resources/openglsdlimageloader.h" +#endif // Guichan stuff Gui *gui; @@ -233,7 +236,7 @@ Gui::mousePress(int mx, int my, int button) // Mouse pressed on window container (basically, the map) // Are we in-game yet? - if (state != GAME_STATE) + if (state != STATE_GAME) return; // Check if we are alive and kickin' @@ -244,8 +247,8 @@ Gui::mousePress(int mx, int my, int button) if (current_npc) return; - int tilex = mx / 32 + camera_x; - int tiley = my / 32 + camera_y; + int tilex = (mx + camera_x) / 32; + int tiley = (my + camera_y) / 32; // Right click might open a popup if (button == gcn::MouseInput::RIGHT) @@ -307,13 +310,14 @@ Gui::mousePress(int mx, int my, int button) player_node->pickUp(item); } // Just walk around - else if (engine->getCurrentMap()->getWalk(tilex, tiley)) + else if (engine->getCurrentMap() && + engine->getCurrentMap()->getWalk(tilex, tiley)) { // XXX XXX XXX REALLY UGLY! Uint8 *keys = SDL_GetKeyState(NULL); if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT])) { - player_node->setDestination(tilex, tiley); + player_node->setDestination(mx + camera_x, my + camera_y); player_node->stopAttack(); } } |