diff --git a/source/blood/src/network.cpp b/source/blood/src/network.cpp index ad4e56b5b..641478b65 100644 --- a/source/blood/src/network.cpp +++ b/source/blood/src/network.cpp @@ -42,21 +42,21 @@ bool gStartNewGame = 0; PACKETMODE gPacketMode = PACKETMODE_1; ClockTicks gNetFifoClock = 0; int gNetFifoTail = 0; -int gNetFifoHead[8]; +int gNetFifoHead[kMaxPlayers]; int gPredictTail = 0; int gNetFifoMasterTail = 0; -GINPUT gFifoInput[256][8]; -int myMinLag[8]; +GINPUT gFifoInput[256][kMaxPlayers]; +int myMinLag[kMaxPlayers]; int otherMinLag = 0; int myMaxLag = 0; unsigned int gChecksum[4]; -unsigned int gCheckFifo[256][8][4]; -int gCheckHead[8]; +unsigned int gCheckFifo[256][kMaxPlayers][4]; +int gCheckHead[kMaxPlayers]; int gSendCheckTail = 0; int gCheckTail = 0; int gInitialNetPlayers = 0; int gBufferJitter = 1; -int gPlayerReady[8]; +int gPlayerReady[kMaxPlayers]; bool bNoResend = true; bool gRobust = false; bool bOutOfSync = false; diff --git a/source/blood/src/network.h b/source/blood/src/network.h index 9be8a67a9..760ae3a55 100644 --- a/source/blood/src/network.h +++ b/source/blood/src/network.h @@ -25,6 +25,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "controls.h" +#ifndef kMaxPlayers // copy define from common_game.h +#define kMaxPlayers 8 +#endif + enum PACKETMODE { PACKETMODE_0 = 0, PACKETMODE_1, @@ -51,21 +55,21 @@ extern bool gStartNewGame; extern PACKETMODE gPacketMode; extern ClockTicks gNetFifoClock; extern int gNetFifoTail; -extern int gNetFifoHead[8]; +extern int gNetFifoHead[kMaxPlayers]; extern int gPredictTail; extern int gNetFifoMasterTail; -extern GINPUT gFifoInput[256][8]; -extern int myMinLag[8]; +extern GINPUT gFifoInput[256][kMaxPlayers]; +extern int myMinLag[kMaxPlayers]; extern int otherMinLag; extern int myMaxLag; extern unsigned int gChecksum[4]; -extern unsigned int gCheckFifo[256][8][4]; -extern int gCheckHead[8]; +extern unsigned int gCheckFifo[256][kMaxPlayers][4]; +extern int gCheckHead[kMaxPlayers]; extern int gSendCheckTail; extern int gCheckTail; extern int gInitialNetPlayers; extern int gBufferJitter; -extern int gPlayerReady[8]; +extern int gPlayerReady[kMaxPlayers]; extern bool bNoResend; extern bool gRobust; extern bool bOutOfSync;