diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2008-11-01 19:03:01 +0000 |
|---|---|---|
| committer | Philipp Sehmisch <tmw@crushnet.org> | 2008-11-01 19:03:01 +0000 |
| commit | 14ef52c7c3413f8c61b50147dcd22f4ed7238078 (patch) | |
| tree | 82888985eeae2f3e21ce5e414d6ae9ac72e37d36 /src/gui | |
| parent | babaec33e51991475ba2ab9ec06c95bbe5f220c0 (diff) | |
| download | mana-client-14ef52c7c3413f8c61b50147dcd22f4ed7238078.tar.gz mana-client-14ef52c7c3413f8c61b50147dcd22f4ed7238078.tar.bz2 mana-client-14ef52c7c3413f8c61b50147dcd22f4ed7238078.tar.xz mana-client-14ef52c7c3413f8c61b50147dcd22f4ed7238078.zip | |
Magic implementation phase 1 and 2 (added netcode and a very crude gui for using special actions like magic)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/menuwindow.cpp | 6 | ||||
| -rw-r--r-- | src/gui/setup.cpp | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp index 84340fc4..c3e572a7 100644 --- a/src/gui/menuwindow.cpp +++ b/src/gui/menuwindow.cpp @@ -36,6 +36,7 @@ extern Window *setupWindow; extern Window *inventoryWindow; extern Window *equipmentWindow; extern Window *skillDialog; +extern Window *magicDialog; extern Window *statusWindow; extern Window *guildWindow; extern Window *itemShortcutWindow; @@ -64,6 +65,7 @@ MenuWindow::MenuWindow(): N_("Equipment"), N_("Inventory"), N_("Skills"), + N_("Magic"), N_("Guilds"), N_("Shortcut"), N_("Setup"), @@ -110,6 +112,10 @@ void MenuWindowListener::action(const gcn::ActionEvent &event) { window = skillDialog; } + else if (event.getId() == "Magic") + { + window = magicDialog; + } else if (event.getId() == "Guilds") { window = guildWindow; diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 53e7a9f1..b6b052bc 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -43,6 +43,7 @@ extern Window *inventoryWindow; extern Window *equipmentWindow; extern Window *helpWindow; extern Window *skillDialog; +extern Window *magicDialog; extern Window *guildWindow; Setup::Setup(): @@ -116,6 +117,7 @@ void Setup::action(const gcn::ActionEvent &event) equipmentWindow->resetToDefaultSize(); helpWindow->resetToDefaultSize(); skillDialog->resetToDefaultSize(); + magicDialog->resetToDefaultSize(); guildWindow->resetToDefaultSize(); } } |