diff options
| author | Kiyoshi Kyokai <kiyoshi.kyokai@gmail.com> | 2005-02-28 14:15:21 +0000 |
|---|---|---|
| committer | Kiyoshi Kyokai <kiyoshi.kyokai@gmail.com> | 2005-02-28 14:15:21 +0000 |
| commit | 11b6a73acc5a6d6fae36074002ac3ce2400ca860 (patch) | |
| tree | f74f63645af0a834a6e0fd557c61c206936b720b | |
| parent | 95551ea073dd984509ea5a7e13832952193be8cd (diff) | |
| download | mana-11b6a73acc5a6d6fae36074002ac3ce2400ca860.tar.gz mana-11b6a73acc5a6d6fae36074002ac3ce2400ca860.tar.bz2 mana-11b6a73acc5a6d6fae36074002ac3ce2400ca860.tar.xz mana-11b6a73acc5a6d6fae36074002ac3ce2400ca860.zip | |
*** empty log message ***
| -rw-r--r-- | The Mana World.dev | 24 | ||||
| -rw-r--r-- | src/graphic/graphic.cpp | 11 |
2 files changed, 32 insertions, 3 deletions
diff --git a/The Mana World.dev b/The Mana World.dev index c4506003..7f35310b 100644 --- a/The Mana World.dev +++ b/The Mana World.dev @@ -1,7 +1,7 @@ [Project] FileName=The Mana World.dev Name=tmw -UnitCount=101 +UnitCount=103 Type=0 Ver=1 ObjFiles= @@ -1055,7 +1055,27 @@ BuildCmd= [Unit101] FileName=src\gui\newskill.cpp CompileCpp=1 -Folder=tmw +Folder=gui +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit102] +FileName=src\gui\chargedialog.h +CompileCpp=1 +Folder=gui +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit103] +FileName=src\gui\chargedialog.cpp +CompileCpp=1 +Folder=gui Compile=1 Link=1 Priority=1000 diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index 9ded7f3e..ce4bc4a1 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -28,6 +28,7 @@ #include "../gui/minimap.h" #include "../gui/equipment.h" #include "../gui/newskill.h" +#include "../gui/chargedialog.h" #include "../main.h" #include "../being.h" #ifdef USE_OPENGL @@ -62,6 +63,7 @@ StatsWindow *statsWindow; Setup* setupWindow; Minimap *minimap; EquipmentWindow *equipmentWindow; +ChargeDialog *chargeDialog; void ChatListener::action(const std::string& eventId) { @@ -285,6 +287,7 @@ Engine::Engine() newSkillWindow = new NewSkillDialog(); newSkillWindow->setVisible(false); + statsWindow = new StatsWindow(); statsWindow->setVisible(false); statsWindow->setPosition( @@ -298,7 +301,13 @@ Engine::Engine() equipmentWindow = new EquipmentWindow(); equipmentWindow->setVisible(false); - + + chargeDialog = new ChargeDialog(); + chargeDialog->setVisible(true); + chargeDialog->setPosition( + screen->w - 5 - chargeDialog->getWidth(), + screen->h - chargeDialog->getHeight() - 15); + // Give focus to the chat input chatInput->requestFocus(); |