From bd1523ef2d600cff2416d137a7cfa465bc286476 Mon Sep 17 00:00:00 2001
From: BSzili
Date: Sun, 19 Jan 2020 20:49:01 +0100
Subject: [PATCH] Rednukem: fix building with NETCODE_DISABLE
# Conflicts:
# source/rr/src/game.cpp
# source/rr/src/net.h
---
source/rr/src/game.cpp | 26 +++++++++++++-------------
source/rr/src/net.h | 7 +++++++
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/source/rr/src/game.cpp b/source/rr/src/game.cpp
index 8a55cfed3..cca7fa239 100644
--- a/source/rr/src/game.cpp
+++ b/source/rr/src/game.cpp
@@ -1,4 +1,4 @@
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
/*
Copyright (C) 2016 EDuke32 developers and contributors
@@ -7428,23 +7428,23 @@ MAIN_LOOP_RESTART:
{
do
{
- //if (g_networkMode != NET_DEDICATED_SERVER)
- //{
- // if (RRRA && g_player[myconnectindex].ps->on_motorcycle)
- // P_GetInputMotorcycle(myconnectindex);
- // else if (RRRA && g_player[myconnectindex].ps->on_boat)
- // P_GetInputBoat(myconnectindex);
- // else
- // P_GetInput(myconnectindex);
- //}
-
- //Bmemcpy(&inputfifo[0][myconnectindex], &localInput, sizeof(input_t));
-
if (!frameJustDrawn)
break;
frameJustDrawn = false;
+#ifdef NETCODE_DISABLE
+ if (RRRA && g_player[myconnectindex].ps->on_motorcycle)
+ P_GetInputMotorcycle(myconnectindex);
+ else if (RRRA && g_player[myconnectindex].ps->on_boat)
+ P_GetInputBoat(myconnectindex);
+ else
+ P_GetInput(myconnectindex);
+
+ inputfifo[g_player[myconnectindex].movefifoend&(MOVEFIFOSIZ-1)][myconnectindex] = localInput;
+ g_player[myconnectindex].movefifoend++;
+#endif
+
do
{
if (ready2send == 0) break;
diff --git a/source/rr/src/net.h b/source/rr/src/net.h
index f678c4ea0..f994192be 100644
--- a/source/rr/src/net.h
+++ b/source/rr/src/net.h
@@ -398,6 +398,13 @@ void Net_SendRTS(int ridiculeNum);
#define Net_SendTaunt(...) ((void)0)
#define Net_SendRTS(...) ((void)0)
+#define Net_WaitForEverybody(...) ((void)0)
+#define initsynccrc(...) ((void)0)
+#define Net_GetSyncStat(...) ((void)0)
+#define Net_DisplaySyncMsg(...) ((void)0)
+#define Net_ClearFIFO(...) ((void)0)
+#define Net_GetInput(...) ((void)0)
+
#endif
END_RR_NS