5 files changed, 27 insertions, 4 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 7dfb6277..e6658bbf 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -45,6 +45,8 @@
 
 #include <SDL_types.h>
 
+namespace EAthena {
+
 enum { debugInventory = 1 };
 
 InventoryHandler *inventoryHandler;
@@ -368,3 +370,5 @@ void InventoryHandler::moveItem(StorageType source, int slot, int amount,
         outMsg.writeInt32(amount);
     }
 }
+
+} // namespace EAthena
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index bfebc9b3..391c13f4 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -26,6 +26,8 @@
 #include "net/messagehandler.h"
 #include "net/net.h"
 
+namespace EAthena {
+
 class InventoryHandler : public MessageHandler, public Net::InventoryHandler
 {
     public:
@@ -51,6 +53,6 @@ class InventoryHandler : public MessageHandler, public Net::InventoryHandler
                       StorageType destination);
 };
 
-extern InventoryHandler *inventoryHandler;
+} // namespace EAthena
 
 #endif // NET_EA_INVENTORYHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 39575372..8921a954 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -35,16 +35,21 @@
 #include "net/skillhandler.h"
 #include "net/tradehandler.h"
 
-#ifdef TMWSERV_SUPPORT
 #include "net/tmwserv/inventoryhandler.h"
+#include "net/ea/inventoryhandler.h"
+
+#ifdef TMWSERV_SUPPORT
 #include "net/tmwserv/playerhandler.h"
 #include "net/tmwserv/tradehandler.h"
 #else
-#include "net/ea/inventoryhandler.h"
 #include "net/ea/playerhandler.h"
 #include "net/ea/tradehandler.h"
 #endif
 
+namespace EAthena {
+extern InventoryHandler *inventoryHandler;
+}
+
 Net::AdminHandler *Net::getAdminHandler()
 {
     // TODO
@@ -77,7 +82,11 @@ Net::GuildHandler *Net::getGuildHandler()
 
 Net::InventoryHandler *Net::getInventoryHandler()
 {
-    return inventoryHandler;
+#ifdef TMWSERV_SUPPORT
+    return TmwServ::inventoryHandler;
+#else
+    return EAthena::inventoryHandler;
+#endif
 }
 
 Net::LoginHandler *Net::getLoginHandler()
diff --git a/src/net/tmwserv/inventoryhandler.cpp b/src/net/tmwserv/inventoryhandler.cpp
index cedeb465..f21c25a9 100644
--- a/src/net/tmwserv/inventoryhandler.cpp
+++ b/src/net/tmwserv/inventoryhandler.cpp
@@ -37,6 +37,8 @@
 
 #include "resources/iteminfo.h"
 
+namespace TmwServ {
+
 Net::InventoryHandler *inventoryHandler;
 
 InventoryHandler::InventoryHandler()
@@ -123,3 +125,5 @@ void InventoryHandler::moveItem(StorageType source, int slot, int amount,
 {
     // TODO
 }
+
+} // namespace TmwServ
diff --git a/src/net/tmwserv/inventoryhandler.h b/src/net/tmwserv/inventoryhandler.h
index 5dd788ef..38281e2a 100644
--- a/src/net/tmwserv/inventoryhandler.h
+++ b/src/net/tmwserv/inventoryhandler.h
@@ -25,6 +25,8 @@
 #include "net/inventoryhandler.h"
 #include "net/messagehandler.h"
 
+namespace TmwServ {
+
 class InventoryHandler : public MessageHandler, Net::InventoryHandler
 {
     public:
@@ -52,4 +54,6 @@ class InventoryHandler : public MessageHandler, Net::InventoryHandler
 
 extern Net::InventoryHandler *inventoryHandler;
 
+} // namespace TmwServ
+
 #endif