diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-28 23:04:08 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-28 23:04:08 +0000 |
| commit | 391203d83ed7a72b54fb7d7c72dbe35db14f0ea9 (patch) | |
| tree | a9a9e14bbbdde0b48c66b99038d505a42a51609b /src/gui/gui.cpp | |
| parent | af61e1e7df91b97c3f7516e9eb2b37b621f069ad (diff) | |
| download | mana-391203d83ed7a72b54fb7d7c72dbe35db14f0ea9.tar.gz mana-391203d83ed7a72b54fb7d7c72dbe35db14f0ea9.tar.bz2 mana-391203d83ed7a72b54fb7d7c72dbe35db14f0ea9.tar.xz mana-391203d83ed7a72b54fb7d7c72dbe35db14f0ea9.zip | |
Merged trunk development between revisions 2530 and 2618 to the 0.1.0 branch.
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 69563dc1..b27868e3 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -27,11 +27,13 @@ #include <guichan/image.hpp> #include <guichan/imagefont.hpp> - -// Moved up because of nested inclusion of winnt.h which defines DELETE -// constant as well as guichan does +// Should stay here because of Guichan being sensitive to headers order #include <guichan/sdl/sdlinput.hpp> +#ifdef USE_OPENGL +#include "../resources/openglsdlimageloader.h" +#endif + #include "focushandler.h" #include "popupmenu.h" #include "window.h" @@ -231,6 +233,7 @@ Gui::draw() void Gui::mousePress(int mx, int my, int button) { + printf("Gui::mousePress(%d,%d)\n", mx, my); // Mouse pressed on window container (basically, the map) // Are we in-game yet? @@ -247,6 +250,7 @@ Gui::mousePress(int mx, int my, int button) int tilex = (mx + camera_x) / 32; int tiley = (my + camera_y) / 32; + printf("tilex,tiley: %d,%d\n", tilex, tiley); // Right click might open a popup if (button == gcn::MouseInput::RIGHT) |