summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKiyoshi Kyokai <kiyoshi.kyokai@gmail.com>2005-02-20 22:57:12 +0000
committerKiyoshi Kyokai <kiyoshi.kyokai@gmail.com>2005-02-20 22:57:12 +0000
commitf59f38910b5ed7acb22cb9713431a4e8343b0c4b (patch)
treebf9dc21c4ef00124873a8f862aaebdeb4c3d445f /src
parent7ce021a8e4fce72af6e79cad22243bdd50bb8656 (diff)
downloadmana-f59f38910b5ed7acb22cb9713431a4e8343b0c4b.tar.gz
mana-f59f38910b5ed7acb22cb9713431a4e8343b0c4b.tar.bz2
mana-f59f38910b5ed7acb22cb9713431a4e8343b0c4b.tar.xz
mana-f59f38910b5ed7acb22cb9713431a4e8343b0c4b.zip
Added basic functionality for the new skill dialog. Class support, initialization, creation, deconstruction, etc. You can activate it with ALT+n.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp4
-rw-r--r--src/graphic/graphic.cpp6
-rw-r--r--src/graphic/graphic.h2
-rw-r--r--src/net/network.cpp2
4 files changed, 13 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index e9edee54..d53ddcc2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -220,6 +220,10 @@ void do_input()
statsWindow->setVisible(!statsWindow->isVisible());
used = true;
}
+ else if (keysym.sym == SDLK_n) {
+ newSkillWindow->setVisible(!newSkillWindow->isVisible());
+ used = true;
+ }
else if (keysym.sym == SDLK_k) {
skillDialog->setVisible(!skillDialog->isVisible());
used = true;
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index 83ed22bc..96f36bbd 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -27,6 +27,7 @@
#include "../gui/status.h"
#include "../gui/minimap.h"
#include "../gui/equipment.h"
+#include "../gui/newskill.h"
#include "../main.h"
#include "../being.h"
#ifdef USE_OPENGL
@@ -56,6 +57,7 @@ InventoryWindow *inventoryWindow;
NpcListDialog *npcListDialog;
NpcTextDialog *npcTextDialog;
SkillDialog *skillDialog;
+NewSkillDialog *newSkillWindow;
StatsWindow *statsWindow;
Setup* setupWindow;
Minimap *minimap;
@@ -302,6 +304,9 @@ Engine::Engine()
skillDialog = new SkillDialog();
skillDialog->setVisible(false);
+ newSkillWindow = new NewSkillDialog();
+ newSkillWindow->setVisible(false);
+
statsWindow = new StatsWindow();
statsWindow->setVisible(false);
statsWindow->setPosition(
@@ -351,6 +356,7 @@ Engine::~Engine()
delete setupWindow;
delete minimap;
delete equipmentWindow;
+ delete newSkillWindow;
delete monsterset;
delete npcset;
diff --git a/src/graphic/graphic.h b/src/graphic/graphic.h
index c6faccda..765a6318 100644
--- a/src/graphic/graphic.h
+++ b/src/graphic/graphic.h
@@ -39,6 +39,7 @@ class Graphics;
#include "../gui/status.h"
#include "../gui/stats.h"
#include "../gui/skill.h"
+#include "../gui/newskill.h"
#include "../gui/setup.h"
#include "../gui/equipment.h"
#include "../resources/resourcemanager.h"
@@ -70,6 +71,7 @@ extern InventoryWindow *inventoryWindow;
extern NpcListDialog *npcListDialog;
extern NpcTextDialog *npcTextDialog;
extern SkillDialog *skillDialog;
+extern NewSkillDialog *newSkillWindow;
extern StatsWindow *statsWindow;
extern Setup *setupWindow;
extern EquipmentWindow *equipmentWindow;
diff --git a/src/net/network.cpp b/src/net/network.cpp
index 8ad0fd85..2e563fb7 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -180,4 +180,4 @@ void flush()
#endif
} else RFIFOSET(ret); // Set size of available data to read
}
-}
+} \ No newline at end of file