summaryrefslogtreecommitdiff
path: root/src/graphic
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2005-02-11 17:21:55 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2005-02-11 17:21:55 +0000
commit448fe8430f5f0ae81101fe86d664f98be1a92201 (patch)
tree76737e4447cca1dd24c4e9203a2d2ea674d72a1e /src/graphic
parent528ded235f60c349272ecbf428731b2f579ed758 (diff)
downloadmana-448fe8430f5f0ae81101fe86d664f98be1a92201.tar.gz
mana-448fe8430f5f0ae81101fe86d664f98be1a92201.tar.bz2
mana-448fe8430f5f0ae81101fe86d664f98be1a92201.tar.xz
mana-448fe8430f5f0ae81101fe86d664f98be1a92201.zip
Working on equipment
Diffstat (limited to 'src/graphic')
-rw-r--r--src/graphic/graphic.cpp9
-rw-r--r--src/graphic/graphic.h2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index 65775c75..bff5a29b 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -26,6 +26,7 @@
#include "../gui/textfield.h"
#include "../gui/status.h"
#include "../gui/minimap.h"
+#include "../gui/equipment.h"
#include "../main.h"
#include "../being.h"
@@ -55,6 +56,7 @@ SkillDialog *skillDialog;
StatsWindow *statsWindow;
Setup* setupWindow;
Minimap *minimap;
+EquipmentWindow *equipmentWindow;
void ChatListener::action(const std::string& eventId)
{
@@ -269,9 +271,10 @@ Engine::Engine()
setupWindow = new Setup();
setupWindow->setVisible(false);
- // Create minimap
-
minimap = new Minimap();
+
+ equipmentWindow = new EquipmentWindow();
+ equipmentWindow->setVisible(true);
// Give focus to the chat input
chatInput->requestFocus();
@@ -310,6 +313,8 @@ Engine::~Engine()
delete skillDialog;
delete statsWindow;
delete setupWindow;
+ delete minimap;
+ delete equipmentWindow;
delete tileset;
delete monsterset;
diff --git a/src/graphic/graphic.h b/src/graphic/graphic.h
index 8b4a2bde..0bae4327 100644
--- a/src/graphic/graphic.h
+++ b/src/graphic/graphic.h
@@ -42,6 +42,7 @@ class Graphics;
#include "../gui/stats.h"
#include "../gui/skill.h"
#include "../gui/setup.h"
+#include "../gui/equipment.h"
#include "../resources/resourcemanager.h"
#include "spriteset.h"
#include <SDL.h>
@@ -69,6 +70,7 @@ extern NpcTextDialog *npcTextDialog;
extern SkillDialog *skillDialog;
extern StatsWindow *statsWindow;
extern Setup *setupWindow;
+extern EquipmentWindow *equipmentWindow;
char get_x_offset(char, char);
char get_y_offset(char, char);