From f59f38910b5ed7acb22cb9713431a4e8343b0c4b Mon Sep 17 00:00:00 2001 From: Kiyoshi Kyokai Date: Sun, 20 Feb 2005 22:57:12 +0000 Subject: Added basic functionality for the new skill dialog. Class support, initialization, creation, deconstruction, etc. You can activate it with ALT+n. --- The Mana World.dev | 14 ++++++++++++-- src/game.cpp | 4 ++++ src/graphic/graphic.cpp | 6 ++++++ src/graphic/graphic.h | 2 ++ src/net/network.cpp | 2 +- tmw.ini | 2 +- 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/The Mana World.dev b/The Mana World.dev index 445b1086..c4506003 100644 --- a/The Mana World.dev +++ b/The Mana World.dev @@ -1,7 +1,7 @@ [Project] FileName=The Mana World.dev Name=tmw -UnitCount=99 +UnitCount=101 Type=0 Ver=1 ObjFiles= @@ -1043,7 +1043,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit100] -FileName=src\gui\equipment.cpp +FileName=src\gui\newskill.h CompileCpp=1 Folder=gui Compile=1 @@ -1052,3 +1052,13 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= +[Unit101] +FileName=src\gui\newskill.cpp +CompileCpp=1 +Folder=tmw +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + 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 diff --git a/tmw.ini b/tmw.ini index dfad3ebb..1af8115a 100644 --- a/tmw.ini +++ b/tmw.ini @@ -8,5 +8,5 @@ sound=0 stretch=0 system= url=http://localhost/ -username=Player +username=Kyokai version=0.200000 -- cgit v1.2.3-70-g09d2