zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rednukem: fix building with NETCODE_DISABLE 

# Conflicts:
#	source/rr/src/game.cpp
#	source/rr/src/net.h
This commit is contained in:
BSzili 2020-01-19 20:49:01 +01:00 committed by Christoph Oelckers
parent 6f39b87d5b
commit bd1523ef2d
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/rr/src/game.cpp
View File

@ -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;

7
source/rr/src/net.h
View File

@ -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