summaryrefslogtreecommitdiff
path: root/src/gui/gui.h
diff options
context:
space:
mode:
authorHal9OOO <miglietta.francesco@gmail.com>2012-10-25 19:15:19 +0200
committerHal9OOO <miglietta.francesco@gmail.com>2012-10-25 19:15:19 +0200
commit3531d0f9abc4c773cab8353a0b70ad3d4a3a255e (patch)
tree7f934b293c04321d6791f40f673b10a2e8ea1a0d /src/gui/gui.h
parent4358743175ef738cd2943ab1e5fb741c560f1bd4 (diff)
parent1e4aa6a5e7476bea736b89fe5d7094b6a68705e5 (diff)
downloadmanaverse-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.tar.gz
manaverse-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.tar.bz2
manaverse-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.tar.xz
manaverse-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/gui.h')
-rw-r--r--src/gui/gui.h20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/gui/gui.h b/src/gui/gui.h
index c327a4b81..e8969d666 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -23,6 +23,8 @@
#ifndef GUI_H
#define GUI_H
+#include "resources/cursor.h"
+
#include <guichan/gui.hpp>
#include "localconsts.h"
@@ -139,24 +141,6 @@ class Gui final : public gcn::Gui
void getAbsolutePosition(gcn::Widget *widget, int &x, int &y);
- /**
- * Cursors are in graphic order from left to right.
- * CURSOR_POINTER should be left untouched.
- * CURSOR_TOTAL should always be last.
- */
- enum
- {
- CURSOR_POINTER = 0,
- CURSOR_RESIZE_ACROSS,
- CURSOR_RESIZE_DOWN,
- CURSOR_RESIZE_DOWN_LEFT,
- CURSOR_RESIZE_DOWN_RIGHT,
- CURSOR_FIGHT,
- CURSOR_PICKUP,
- CURSOR_TALK,
- CURSOR_TOTAL
- };
-
protected:
void handleMouseMoved(const gcn::MouseInput &mouseInput);