#5346: Remove IGameConnection interface and header

Now that GameConnection is a self-contained plugin, there is no further need for a defined module interface.
codereader · Sep 28, 2020 · 0d1aa0c · 0d1aa0c
1 parent 27ffd54
commit 0d1aa0c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 37 deletions.
diff --git a/include/igameconnection.h b/include/igameconnection.h
diff --git a/plugins/dm.gameconnection/GameConnection.cpp b/plugins/dm.gameconnection/GameConnection.cpp
@@ -183,7 +183,7 @@ GameConnection::~GameConnection() {
 
 const std::string& GameConnection::getName() const
 {
-    static std::string _name = MODULE_GAMECONNECTION;
+    static std::string _name("GameConnection");
     return _name;
 }
 
@@ -467,3 +467,9 @@ void GameConnection::doUpdateMap() {
 }
 
 }
+
+extern "C" void DARKRADIANT_DLLEXPORT RegisterModule(IModuleRegistry& registry)
+{
+    module::performDefaultInitialisation(registry);
+    registry.registerModule(std::make_shared<gameconn::GameConnection>());
+}
diff --git a/plugins/dm.gameconnection/GameConnection.h b/plugins/dm.gameconnection/GameConnection.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "igameconnection.h"
 #include "icommandsystem.h"
 #include "iscenegraph.h"
 #include "MapObserver.h"
@@ -13,7 +12,8 @@ namespace sigc {
     struct connection;
 }
 
-namespace gameconn {
+namespace gameconn
+{
 
 class MessageTcp;
 
@@ -24,7 +24,7 @@ class MessageTcp;
  *  - updating edited entities in game immediately (aka "hot reload")
  */
 class GameConnection :
-    public IGameConnection,
+    public RegisterableModule,
     public wxEvtHandler			//note: everything before this base must have no data members!
 {
 public:
@@ -140,5 +140,3 @@ class GameConnection :
 };
 
 }
-
-using gameconn::GameConnection;