From 14ef52c7c3413f8c61b50147dcd22f4ed7238078 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Sat, 1 Nov 2008 19:03:01 +0000
Subject: Magic implementation phase 1 and 2 (added netcode and a very crude
 gui for using special actions like magic)

---
 src/gui/menuwindow.cpp | 6 ++++++
 src/gui/setup.cpp      | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'src/gui')

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();
     }
 }
-- 
cgit v1.2.3-70-g09d2