Centralize netcode handler instances in Net

Instead of each netcode making the global variables and Net referencing them, Net now makes them and the netcodes reference them.

Also remove an innappropriate ChatHandler reference from eA's AdminHandler.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 62fe9ea8..a58154f6 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -38,9 +38,7 @@
 
 #include <string>
 
-extern Net::ChatHandler *chatHandler;
-
-Net::AdminHandler *adminHandler;
+extern Net::AdminHandler *adminHandler;
 
 namespace EAthena {
 
@@ -97,7 +95,7 @@ void AdminHandler::kick(int playerId)
 
 void AdminHandler::kick(const std::string &name)
 {
-    chatHandler->talk("@kick " + name);
+    Net::getChatHandler()->talk("@kick " + name);
 }
 
 void AdminHandler::ban(int playerId)
@@ -107,7 +105,7 @@ void AdminHandler::ban(int playerId)
 
 void AdminHandler::ban(const std::string &name)
 {
-    chatHandler->talk("@ban " + name);
+    Net::getChatHandler()->talk("@ban " + name);
 }
 
 void AdminHandler::unban(int playerId)