Make network handler functions virtual

15 files changed, 26 insertions, 24 deletions

diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 1246f1c1..83ac9fb4 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -29,7 +29,7 @@ class BeingHandler : public MessageHandler
     public:
         BeingHandler(bool enableSync);
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 
     private:
         // Should we honor server "Stop Walking" packets
diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h
index 7b85b65d..983fd67a 100644
--- a/src/net/ea/buysellhandler.h
+++ b/src/net/ea/buysellhandler.h
@@ -29,7 +29,7 @@ class BuySellHandler : public MessageHandler
     public:
         BuySellHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 };
 
 #endif // NET_EA_BUYSELLHANDLER_H
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index 3b5a4cd8..ec21a357 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -38,7 +38,7 @@ class CharServerHandler : public MessageHandler
     public:
         CharServerHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 
         void setCharInfo(LockedArray<LocalPlayer*> *charInfo)
         { mCharInfo = charInfo; }
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index 62a8c663..93e3e272 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -29,7 +29,7 @@ class ChatHandler : public MessageHandler
     public:
         ChatHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 };
 
 #endif // NET_EA_CHATHANDLER_H
diff --git a/src/net/ea/equipmenthandler.h b/src/net/ea/equipmenthandler.h
index 2bb73c97..afac0c30 100644
--- a/src/net/ea/equipmenthandler.h
+++ b/src/net/ea/equipmenthandler.h
@@ -29,7 +29,7 @@ class EquipmentHandler : public MessageHandler
     public:
         EquipmentHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 };
 
 #endif // NET_EA_EQUIPMENTHANDLER_H
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 7374fed9..a35021f5 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -29,7 +29,7 @@ class InventoryHandler : public MessageHandler
     public:
         InventoryHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 };
 
 #endif // NET_EA_INVENTORYHANDLER_H
diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h
index 42a9e4e7..412d8783 100644
--- a/src/net/ea/itemhandler.h
+++ b/src/net/ea/itemhandler.h
@@ -29,7 +29,7 @@ class ItemHandler : public MessageHandler
     public:
         ItemHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 };
 
 #endif // NET_EA_ITEMHANDLER_H
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 074bc9e2..9afaab23 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -33,7 +33,7 @@ class LoginHandler : public MessageHandler
     public:
         LoginHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 
         void setLoginData(LoginData *loginData) { mLoginData = loginData; }
 
diff --git a/src/net/ea/maploginhandler.h b/src/net/ea/maploginhandler.h
index 40f8e7bc..33ac9ee7 100644
--- a/src/net/ea/maploginhandler.h
+++ b/src/net/ea/maploginhandler.h
@@ -29,7 +29,7 @@ class MapLoginHandler : public MessageHandler
     public:
         MapLoginHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 };
 
 #endif // NET_EA_MAPLOGINHANDLER_H
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 136f07fd..0b9a4cf6 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -25,6 +25,8 @@
 
 #include "net/messagein.h"
 #include "net/messageout.h"
+#include "net/net.h"
+#include "net/npchandler.h"
 
 #include "beingmanager.h"
 #include "localplayer.h"
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index 71e15e02..a8212ce0 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -30,27 +30,27 @@ class NPCHandler : public MessageHandler, public Net::NpcHandler
     public:
         NPCHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 
-        void talk(int npcId);
+        virtual void talk(int npcId);
 
-        void nextDialog(int npcId);
+        virtual void nextDialog(int npcId);
 
-        void closeDialog(int npcId);
+        virtual void closeDialog(int npcId);
 
-        void listInput(int npcId, int value);
+        virtual void listInput(int npcId, int value);
 
-        void integerInput(int npcId, int value);
+        virtual void integerInput(int npcId, int value);
 
-        void stringInput(int npcId, const std::string &value);
+        virtual void stringInput(int npcId, const std::string &value);
 
-        void buy(int beingId);
+        virtual void buy(int beingId);
 
-        void sell(int beingId);
+        virtual void sell(int beingId);
 
-        void buyItem(int beingId, int itemId, int amount);
+        virtual void buyItem(int beingId, int itemId, int amount);
 
-        void sellItem(int beingId, int itemId, int amount);
+        virtual void sellItem(int beingId, int itemId, int amount);
 };
 
 extern NPCHandler *npcHandler;
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index c6ee261b..34c3022e 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -31,7 +31,7 @@ class PartyHandler : public MessageHandler
 
         ~PartyHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 };
 
 #endif // NET_EA_PARTYHANDLER_H
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 9fb2c982..6b36d86f 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -29,7 +29,7 @@ class PlayerHandler : public MessageHandler
     public:
         PlayerHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 };
 
 #endif // NET_EA_PLAYERHANDLER_H
diff --git a/src/net/ea/skillhandler.h b/src/net/ea/skillhandler.h
index f2c950c9..8aa35c19 100644
--- a/src/net/ea/skillhandler.h
+++ b/src/net/ea/skillhandler.h
@@ -29,7 +29,7 @@ class SkillHandler : public MessageHandler
     public:
         SkillHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 };
 
 #endif // NET_EA_SKILLHANDLER_H
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index e141f6b5..04a3c3e3 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -29,7 +29,7 @@ class TradeHandler : public MessageHandler
     public:
         TradeHandler();
 
-        void handleMessage(MessageIn &msg);
+        virtual void handleMessage(MessageIn &msg);
 };
 
 #endif // NET_EA_TRADEHANDLER_H