From 423f424b20d9c7178e7571327b64f9d09ca6eb1a Mon Sep 17 00:00:00 2001 From: codereader Date: Mon, 28 Sep 2020 05:41:11 +0200 Subject: [PATCH] #5346: Partially apply 88085f5a56a4f396b88fb1df52187f1550a937c1 and 954dd4405d8a558b22c11622c23f7d8f634191c6from orbweaver/master. - Move GameConnection into a separate plugin - Add missing clsocket files to gameconnection plugin Makefile.am --- configure.ac | 3 +++ plugins/Makefile.am | 3 ++- .../dm.gameconnection}/DiffDoom3MapWriter.cpp | 0 .../dm.gameconnection}/DiffDoom3MapWriter.h | 0 .../dm.gameconnection}/DiffStatus.h | 0 .../dm.gameconnection}/GameConnection.cpp | 0 .../dm.gameconnection}/GameConnection.h | 0 plugins/dm.gameconnection/Makefile.am | 15 +++++++++++++++ .../dm.gameconnection}/MapObserver.cpp | 0 .../dm.gameconnection}/MapObserver.h | 0 .../dm.gameconnection}/MessageTcp.cpp | 0 .../dm.gameconnection}/MessageTcp.h | 0 .../dm.gameconnection}/clsocket/ActiveSocket.cpp | 0 .../dm.gameconnection}/clsocket/ActiveSocket.h | 0 .../dm.gameconnection}/clsocket/Host.h | 0 .../dm.gameconnection}/clsocket/PassiveSocket.cpp | 0 .../dm.gameconnection}/clsocket/PassiveSocket.h | 0 .../dm.gameconnection}/clsocket/SimpleSocket.cpp | 0 .../dm.gameconnection}/clsocket/SimpleSocket.h | 0 .../dm.gameconnection}/clsocket/StatTimer.h | 0 .../dm.gameconnection}/clsocket/readme.txt | 0 radiant/Makefile.am | 7 ------- radiant/ui/UserInterfaceModule.cpp | 3 +-- 23 files changed, 21 insertions(+), 10 deletions(-) rename {radiant/gameconnection => plugins/dm.gameconnection}/DiffDoom3MapWriter.cpp (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/DiffDoom3MapWriter.h (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/DiffStatus.h (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/GameConnection.cpp (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/GameConnection.h (100%) create mode 100644 plugins/dm.gameconnection/Makefile.am rename {radiant/gameconnection => plugins/dm.gameconnection}/MapObserver.cpp (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/MapObserver.h (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/MessageTcp.cpp (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/MessageTcp.h (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/clsocket/ActiveSocket.cpp (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/clsocket/ActiveSocket.h (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/clsocket/Host.h (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/clsocket/PassiveSocket.cpp (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/clsocket/PassiveSocket.h (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/clsocket/SimpleSocket.cpp (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/clsocket/SimpleSocket.h (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/clsocket/StatTimer.h (100%) rename {radiant/gameconnection => plugins/dm.gameconnection}/clsocket/readme.txt (100%) diff --git a/configure.ac b/configure.ac index 6411941b0d..6f86785b4a 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,7 @@ then conv_plugin="dm.conversation" gui_plugin="dm.gui" editing_plugin="dm.editing" + gameconn_plugin="dm.gameconnection" fi AC_SUBST([sr_plugin]) AC_SUBST([obj_plugin]) @@ -97,6 +98,7 @@ AC_SUBST([difficulty_plugin]) AC_SUBST([conv_plugin]) AC_SUBST([gui_plugin]) AC_SUBST([editing_plugin]) +AC_SUBST([gameconn_plugin]) # Check for required libraries @@ -375,6 +377,7 @@ AC_CONFIG_FILES([install/darkradiant.desktop install/i18n//Makefile.in plugins/dm.difficulty/Makefile plugins/dm.gui/Makefile plugins/dm.editing/Makefile + plugins/dm.gameconnection/Makefile plugins/dm.conversation/Makefile]) AC_OUTPUT diff --git a/plugins/Makefile.am b/plugins/Makefile.am index c49bc6fc20..36cdba6e93 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -9,4 +9,5 @@ SUBDIRS += @sr_plugin@ \ @difficulty_plugin@ \ @conv_plugin@ \ @gui_plugin@ \ - @editing_plugin@ + @editing_plugin@ \ + @gameconn_plugin@ diff --git a/radiant/gameconnection/DiffDoom3MapWriter.cpp b/plugins/dm.gameconnection/DiffDoom3MapWriter.cpp similarity index 100% rename from radiant/gameconnection/DiffDoom3MapWriter.cpp rename to plugins/dm.gameconnection/DiffDoom3MapWriter.cpp diff --git a/radiant/gameconnection/DiffDoom3MapWriter.h b/plugins/dm.gameconnection/DiffDoom3MapWriter.h similarity index 100% rename from radiant/gameconnection/DiffDoom3MapWriter.h rename to plugins/dm.gameconnection/DiffDoom3MapWriter.h diff --git a/radiant/gameconnection/DiffStatus.h b/plugins/dm.gameconnection/DiffStatus.h similarity index 100% rename from radiant/gameconnection/DiffStatus.h rename to plugins/dm.gameconnection/DiffStatus.h diff --git a/radiant/gameconnection/GameConnection.cpp b/plugins/dm.gameconnection/GameConnection.cpp similarity index 100% rename from radiant/gameconnection/GameConnection.cpp rename to plugins/dm.gameconnection/GameConnection.cpp diff --git a/radiant/gameconnection/GameConnection.h b/plugins/dm.gameconnection/GameConnection.h similarity index 100% rename from radiant/gameconnection/GameConnection.h rename to plugins/dm.gameconnection/GameConnection.h diff --git a/plugins/dm.gameconnection/Makefile.am b/plugins/dm.gameconnection/Makefile.am new file mode 100644 index 0000000000..12746dc320 --- /dev/null +++ b/plugins/dm.gameconnection/Makefile.am @@ -0,0 +1,15 @@ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs + +pluginsdir = $(pkglibdir)/plugins +plugins_LTLIBRARIES = dm_gameconnection.la + +dm_gameconnection_la_LIBADD = $(top_builddir)/libs/wxutil/libwxutil.la \ + $(top_builddir)/libs/xmlutil/libxmlutil.la +dm_gameconnection_la_LDFLAGS = -module -avoid-version $(WX_LIBS) $(XML_LIBS) +dm_gameconnection_la_SOURCES = DiffDoom3MapWriter.cpp \ + GameConnection.cpp \ + MapObserver.cpp \ + MessageTcp.cpp \ + clsocket/ActiveSocket.cpp \ + clsocket/PassiveSocket.cpp \ + clsocket/SimpleSocket.cpp diff --git a/radiant/gameconnection/MapObserver.cpp b/plugins/dm.gameconnection/MapObserver.cpp similarity index 100% rename from radiant/gameconnection/MapObserver.cpp rename to plugins/dm.gameconnection/MapObserver.cpp diff --git a/radiant/gameconnection/MapObserver.h b/plugins/dm.gameconnection/MapObserver.h similarity index 100% rename from radiant/gameconnection/MapObserver.h rename to plugins/dm.gameconnection/MapObserver.h diff --git a/radiant/gameconnection/MessageTcp.cpp b/plugins/dm.gameconnection/MessageTcp.cpp similarity index 100% rename from radiant/gameconnection/MessageTcp.cpp rename to plugins/dm.gameconnection/MessageTcp.cpp diff --git a/radiant/gameconnection/MessageTcp.h b/plugins/dm.gameconnection/MessageTcp.h similarity index 100% rename from radiant/gameconnection/MessageTcp.h rename to plugins/dm.gameconnection/MessageTcp.h diff --git a/radiant/gameconnection/clsocket/ActiveSocket.cpp b/plugins/dm.gameconnection/clsocket/ActiveSocket.cpp similarity index 100% rename from radiant/gameconnection/clsocket/ActiveSocket.cpp rename to plugins/dm.gameconnection/clsocket/ActiveSocket.cpp diff --git a/radiant/gameconnection/clsocket/ActiveSocket.h b/plugins/dm.gameconnection/clsocket/ActiveSocket.h similarity index 100% rename from radiant/gameconnection/clsocket/ActiveSocket.h rename to plugins/dm.gameconnection/clsocket/ActiveSocket.h diff --git a/radiant/gameconnection/clsocket/Host.h b/plugins/dm.gameconnection/clsocket/Host.h similarity index 100% rename from radiant/gameconnection/clsocket/Host.h rename to plugins/dm.gameconnection/clsocket/Host.h diff --git a/radiant/gameconnection/clsocket/PassiveSocket.cpp b/plugins/dm.gameconnection/clsocket/PassiveSocket.cpp similarity index 100% rename from radiant/gameconnection/clsocket/PassiveSocket.cpp rename to plugins/dm.gameconnection/clsocket/PassiveSocket.cpp diff --git a/radiant/gameconnection/clsocket/PassiveSocket.h b/plugins/dm.gameconnection/clsocket/PassiveSocket.h similarity index 100% rename from radiant/gameconnection/clsocket/PassiveSocket.h rename to plugins/dm.gameconnection/clsocket/PassiveSocket.h diff --git a/radiant/gameconnection/clsocket/SimpleSocket.cpp b/plugins/dm.gameconnection/clsocket/SimpleSocket.cpp similarity index 100% rename from radiant/gameconnection/clsocket/SimpleSocket.cpp rename to plugins/dm.gameconnection/clsocket/SimpleSocket.cpp diff --git a/radiant/gameconnection/clsocket/SimpleSocket.h b/plugins/dm.gameconnection/clsocket/SimpleSocket.h similarity index 100% rename from radiant/gameconnection/clsocket/SimpleSocket.h rename to plugins/dm.gameconnection/clsocket/SimpleSocket.h diff --git a/radiant/gameconnection/clsocket/StatTimer.h b/plugins/dm.gameconnection/clsocket/StatTimer.h similarity index 100% rename from radiant/gameconnection/clsocket/StatTimer.h rename to plugins/dm.gameconnection/clsocket/StatTimer.h diff --git a/radiant/gameconnection/clsocket/readme.txt b/plugins/dm.gameconnection/clsocket/readme.txt similarity index 100% rename from radiant/gameconnection/clsocket/readme.txt rename to plugins/dm.gameconnection/clsocket/readme.txt diff --git a/radiant/Makefile.am b/radiant/Makefile.am index 540c7f095a..a2db3e90bd 100644 --- a/radiant/Makefile.am +++ b/radiant/Makefile.am @@ -53,13 +53,6 @@ darkradiant_SOURCES = main.cpp \ eventmanager/Statement.cpp \ eventmanager/Toggle.cpp \ eventmanager/WidgetToggle.cpp \ - gameconnection/DiffDoom3MapWriter.cpp \ - gameconnection/GameConnection.cpp \ - gameconnection/MapObserver.cpp \ - gameconnection/MessageTcp.cpp \ - gameconnection/clsocket/ActiveSocket.cpp \ - gameconnection/clsocket/PassiveSocket.cpp \ - gameconnection/clsocket/SimpleSocket.cpp \ render/OpenGLModule.cpp \ ui/UserInterfaceModule.cpp \ ui/Documentation.cpp \ diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp index 3a28acca2b..abe7c6f9ec 100644 --- a/radiant/ui/UserInterfaceModule.cpp +++ b/radiant/ui/UserInterfaceModule.cpp @@ -382,8 +382,7 @@ void UserInterfaceModule::registerUICommands() GlobalCommandSystem().addCommand("RefreshShaders", std::bind(&UserInterfaceModule::refreshShadersCmd, this, std::placeholders::_1)); - // FIXME: should not dynamic_cast, required methods should be in the - // IGameConnection interface + if (IGameConnection *gameconn = GlobalGameConnection()) { GlobalCommandSystem().addCommand("GameConnectionCameraSyncEnable", [gameconn](const cmd::ArgumentList&) { gameconn->setCameraSyncEnabled(true); });