summaryrefslogtreecommitdiff
path: root/src/gui/equipmentwindow.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-07 23:47:57 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-07 23:52:46 +0200
commitd69d85f06fa6dc22ac4c7789e4140e32d119a7f1 (patch)
tree1d2311bfdba616136d0ac26f8cbe9ab73c88f0e4 /src/gui/equipmentwindow.cpp
parent303c1f69761e90b83d4809e911f7785ec66b46aa (diff)
downloadmana-client-d69d85f06fa6dc22ac4c7789e4140e32d119a7f1.tar.gz
mana-client-d69d85f06fa6dc22ac4c7789e4140e32d119a7f1.tar.bz2
mana-client-d69d85f06fa6dc22ac4c7789e4140e32d119a7f1.tar.xz
mana-client-d69d85f06fa6dc22ac4c7789e4140e32d119a7f1.zip
Moved basic widgets into the gui/widgets directory
In an attempt to make the GUI code a little more structured, basic widgets are now put in gui/widgets. Many includes were also cleaned up.
Diffstat (limited to 'src/gui/equipmentwindow.cpp')
-rw-r--r--src/gui/equipmentwindow.cpp43
1 files changed, 22 insertions, 21 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index ef90e674..89be2c5e 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -19,30 +19,31 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#define BOX_WIDTH 36
-#define BOX_HEIGHT 36
+#include "gui/widgets/button.h"
+
+#include "gui/equipmentwindow.h"
+#include "gui/itempopup.h"
+#include "gui/palette.h"
+#include "gui/playerbox.h"
+#include "gui/viewport.h"
+
+#include "equipment.h"
+#include "graphics.h"
+#include "inventory.h"
+#include "item.h"
+#include "localplayer.h"
+
+#include "resources/image.h"
+#include "resources/iteminfo.h"
+#include "resources/resourcemanager.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
#include <guichan/font.hpp>
-#include "button.h"
-#include "equipmentwindow.h"
-#include "itempopup.h"
-#include "palette.h"
-#include "playerbox.h"
-#include "viewport.h"
-
-#include "../equipment.h"
-#include "../graphics.h"
-#include "../inventory.h"
-#include "../item.h"
-#include "../localplayer.h"
-
-#include "../resources/image.h"
-#include "../resources/iteminfo.h"
-#include "../resources/resourcemanager.h"
-
-#include "../utils/gettext.h"
-#include "../utils/stringutils.h"
+static const int BOX_WIDTH = 36;
+static const int BOX_HEIGHT = 36;
// Positions of the boxes, 2nd dimension is X and Y respectively.
static const int boxPosition[][2] = {