Some cleanup and renaming

* Removed superfluous 'virtual' keyword in *Handler implementations
* Renamed NPCHandler to NpcHandler
* Renamed InvyHandler to InventoryHandler
* Made all *Handler interface methods pure virtual
* Used forward declarations in net.h
* Renamed {start,end}Shoping to {start,end}Shopping

1 files changed, 15 insertions, 10 deletions

diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index def4285f..bfebc9b3 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -22,30 +22,35 @@
 #ifndef NET_EA_INVENTORYHANDLER_H
 #define NET_EA_INVENTORYHANDLER_H
 
+#include "net/inventoryhandler.h"
 #include "net/messagehandler.h"
 #include "net/net.h"
 
-class InventoryHandler : public MessageHandler, public Net::InvyHandler
+class InventoryHandler : public MessageHandler, public Net::InventoryHandler
 {
     public:
         InventoryHandler();
 
-        virtual void handleMessage(MessageIn &msg);
+        void handleMessage(MessageIn &msg);
 
-        virtual void equipItem(Item *item);
+        void equipItem(Item *item);
 
-        virtual void unequipItem(Item *item);
+        void unequipItem(Item *item);
 
-        virtual void useItem(Item *item);
+        void useItem(Item *item);
 
-        virtual void dropItem(Item *item, int amount);
+        void dropItem(Item *item, int amount);
 
-        virtual void closeStorage();
+        void splitItem(Item *item, int amount);
 
-        virtual void moveItem(StorageType source, int slot, int amount,
-                 StorageType destination);
+        void openStorage();
+
+        void closeStorage();
+
+        void moveItem(StorageType source, int slot, int amount,
+                      StorageType destination);
 };
 
-extern InventoryHandler *invyHandler;
+extern InventoryHandler *inventoryHandler;
 
 #endif // NET_EA_INVENTORYHANDLER_H