Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Blood: Use kMaxPlayers define in more places #813

Closed
wants to merge 1 commit into from
Closed

Blood: Use kMaxPlayers define in more places #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions source/blood/src/network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 10 additions & 6 deletions source/blood/src/network.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand Down