Add SpecialsWindow

THis replaces the MagicWindow that the TMWServ build used and will be
usable going forward for eAthena.

4 files changed, 15 insertions, 2 deletions

diff --git a/src/net/tmwserv/generalhandler.cpp b/src/net/tmwserv/generalhandler.cpp
index d643586b..011433fe 100644
--- a/src/net/tmwserv/generalhandler.cpp
+++ b/src/net/tmwserv/generalhandler.cpp
@@ -22,6 +22,7 @@
 #include "gui/inventorywindow.h"
 #include "gui/partywindow.h"
 #include "gui/skilldialog.h"
+#include "gui/specialswindow.h"
 #include "gui/statuswindow.h"
 
 #include "net/tmwserv/generalhandler.h"
@@ -43,6 +44,7 @@
 #include "net/tmwserv/npchandler.h"
 #include "net/tmwserv/partyhandler.h"
 #include "net/tmwserv/playerhandler.h"
+#include "net/tmwserv/specialhandler.h"
 #include "net/tmwserv/tradehandler.h"
 
 #include "utils/gettext.h"
@@ -72,7 +74,8 @@ GeneralHandler::GeneralHandler():
     mNpcHandler(new NpcHandler),
     mPartyHandler(new PartyHandler),
     mPlayerHandler(new PlayerHandler),
-    mTradeHandler(new TradeHandler)
+    mTradeHandler(new TradeHandler),
+    mSpecialHandler(new SpecialHandler)
 {
     accountServerConnection = Net::getConnection();
     gameServerConnection = Net::getConnection();
@@ -149,6 +152,7 @@ void GeneralHandler::guiWindowsLoaded()
     inventoryWindow->setSplitAllowed(true);
     partyWindow->clearPartyName();
     skillDialog->loadSkills("tmw-skills.xml");
+    specialsWindow->loadSpecials("specials.xml");
 
     player_node->setExpNeeded(100);
 
diff --git a/src/net/tmwserv/generalhandler.h b/src/net/tmwserv/generalhandler.h
index 08e18850..40166ca0 100644
--- a/src/net/tmwserv/generalhandler.h
+++ b/src/net/tmwserv/generalhandler.h
@@ -63,6 +63,7 @@ class GeneralHandler : public Net::GeneralHandler
         MessageHandlerPtr mPartyHandler;
         MessageHandlerPtr mPlayerHandler;
         MessageHandlerPtr mTradeHandler;
+        MessageHandlerPtr mSpecialHandler;
 };
 
 } // namespace TmwServ
diff --git a/src/net/tmwserv/specialhandler.cpp b/src/net/tmwserv/specialhandler.cpp
index f259e77a..2e4ff1bb 100644
--- a/src/net/tmwserv/specialhandler.cpp
+++ b/src/net/tmwserv/specialhandler.cpp
@@ -37,6 +37,11 @@ SpecialHandler::SpecialHandler()
     specialHandler = this;
 }
 
+void SpecialHandler::handleMessage(MessageIn &msg)
+{
+    // TODO
+}
+
 void SpecialHandler::use(int id)
 {
     MessageOut msg(PGMSG_USE_SPECIAL);
diff --git a/src/net/tmwserv/specialhandler.h b/src/net/tmwserv/specialhandler.h
index c7ebd6a2..b8f0ce90 100644
--- a/src/net/tmwserv/specialhandler.h
+++ b/src/net/tmwserv/specialhandler.h
@@ -22,15 +22,18 @@
 #ifndef NET_TMWSERV_SKILLHANDLER_H
 #define NET_TMWSERV_SKILLHANDLER_H
 
+#include "net/messagehandler.h"
 #include "net/specialhandler.h"
 
 namespace TmwServ {
 
-class SpecialHandler : public Net::SpecialHandler
+class SpecialHandler : public MessageHandler, public Net::SpecialHandler
 {
     public:
         SpecialHandler();
 
+        void handleMessage(MessageIn &msg);
+
         void use(int id);
 
         void use(int id, int level, int beingId);