Reduce the number of netplay.h includes, replace with `sync_debug.h…

…` if that's enough Signed-off-by: Pavel Solodovnikov <pavel.al.solodovnikov@gmail.com>
Warzone2100 · Apr 25, 2024 · 64025c9 · 64025c9
1 parent 2d24e52
commit 64025c9
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 16 deletions.
diff --git a/src/astar.cpp b/src/astar.cpp
@@ -52,7 +52,7 @@
 #include <algorithm>
 #include <memory>
 
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 
 /// A coordinate.
 struct PathCoord

diff --git a/src/baseobject.cpp b/src/baseobject.cpp
@@ -19,7 +19,7 @@
 */
 
 #include "lib/framework/frame.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 #include "lib/sound/audio.h"
 
 #include "baseobject.h"

diff --git a/src/combat.cpp b/src/combat.cpp
@@ -26,7 +26,7 @@
 
 #include "lib/framework/frame.h"
 #include "lib/framework/fixedpoint.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 
 #include "action.h"
 #include "combat.h"

diff --git a/src/droid.cpp b/src/droid.cpp
@@ -34,7 +34,7 @@
 #include "lib/ivis_opengl/ivisdef.h"
 #include "lib/sound/audio.h"
 #include "lib/sound/audio_id.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 
 #include "objects.h"
 #include "loop.h"

diff --git a/src/feature.cpp b/src/feature.cpp
@@ -27,7 +27,7 @@
 #include "lib/gamelib/gtime.h"
 #include "lib/sound/audio.h"
 #include "lib/sound/audio_id.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 #include "lib/ivis_opengl/imd.h"
 #include "lib/ivis_opengl/ivisdef.h"
 

diff --git a/src/fpath.cpp b/src/fpath.cpp
@@ -29,7 +29,7 @@
 
 #include "lib/framework/frame.h"
 #include "lib/framework/crc.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 
 #include "lib/framework/wzapp.h"
 

diff --git a/src/group.cpp b/src/group.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "lib/framework/frame.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 
 #include "multiplay.h"
 #include "group.h"

diff --git a/src/map.cpp b/src/map.cpp
@@ -31,7 +31,7 @@
 #include "lib/framework/file.h"
 #include "lib/framework/physfs_ext.h"
 #include "lib/ivis_opengl/tex.h"
-#include "lib/netplay/netplay.h"  // For syncDebug
+#include "lib/netplay/sync_debug.h"
 #include <wzmaplib/map.h>
 
 #include "map.h"

diff --git a/src/move.cpp b/src/move.cpp
@@ -28,7 +28,6 @@
 #include "lib/framework/trig.h"
 #include "lib/framework/math_ext.h"
 #include "lib/gamelib/gtime.h"
-#include "lib/netplay/netplay.h"
 #include "lib/sound/audio.h"
 #include "lib/sound/audio_id.h"
 #include "lib/ivis_opengl/ivisdef.h"

diff --git a/src/objmem.cpp b/src/objmem.cpp
@@ -28,7 +28,7 @@
 #include "lib/framework/frame.h"
 #include "objects.h"
 #include "lib/gamelib/gtime.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 #include "hci.h"
 #include "map.h"
 #include "power.h"

diff --git a/src/power.cpp b/src/power.cpp
@@ -30,7 +30,7 @@
 #include "lib/sound/audio.h"
 #include "objmem.h"
 #include "frontend.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 #include "multiplay.h"
 #include "multiint.h"
 #include "feature.h"

diff --git a/src/random.cpp b/src/random.cpp
@@ -18,7 +18,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 #include "random.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 
 static MersenneTwister gamePseudorandomNumberGenerator;
 static uint32_t lastSeed = 0;

diff --git a/src/research.cpp b/src/research.cpp
@@ -27,7 +27,7 @@
 #include <map>
 
 #include "lib/framework/frame.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 #include "lib/ivis_opengl/imd.h"
 #include "objects.h"
 #include "lib/gamelib/gtime.h"

diff --git a/src/structure.cpp b/src/structure.cpp
@@ -72,7 +72,7 @@
 #include "game.h"
 #include "qtscript.h"
 #include "multiplay.h"
-#include "lib/netplay/netplay.h"
+#include "lib/netplay/sync_debug.h"
 #include "multigifts.h"
 #include "loop.h"
 #include "template.h"

diff --git a/src/titleui/msgbox.cpp b/src/titleui/msgbox.cpp
@@ -32,7 +32,6 @@
 #include "lib/ivis_opengl/piemode.h"
 #include "lib/ivis_opengl/piestate.h"
 #include "lib/ivis_opengl/screen.h"
-#include "lib/netplay/netplay.h"
 #include "lib/widget/label.h"
 #include "lib/widget/paragraph.h"
 #include "../multiplay.h"

diff --git a/src/titleui/old.cpp b/src/titleui/old.cpp
@@ -29,7 +29,6 @@
 #include "lib/ivis_opengl/piemode.h"
 #include "lib/ivis_opengl/piestate.h"
 #include "lib/ivis_opengl/screen.h"
-#include "lib/netplay/netplay.h"
 #include "../intdisplay.h"
 #include "../frontend.h"
 #include "../hci.h"