q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-26 04:05:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mismerge fix.

Browse Source
This commit is contained in:
Ryan C. Gordon 2016-03-30 10:56:56 -04:00
parent 146da64d86
commit 888b35dbca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Engine/Network/Network.cpp
View File

@ -58,18 +58,18 @@
#include <Engine/Templates/Stock_CShader.h> #include <Engine/Templates/Stock_CShader.h>
#include <Engine/Templates/Stock_CSkeleton.h> #include <Engine/Templates/Stock_CSkeleton.h>
#include <Engine/GameAgent/GameAgent.h>
// pointer to global instance of the only game object in the application // pointer to global instance of the only game object in the application
CNetworkLibrary *_pNetwork= NULL; CNetworkLibrary *_pNetwork= NULL;
extern BOOL _bNeedPretouch; extern BOOL _bNeedPretouch;
BOOL _bMultiPlayer = FALSE; BOOL _bMultiPlayer = FALSE;
INDEX _ctEntities = 0; INDEX _ctEntities = 0;
INDEX _ctPredictorEntities = 0; INDEX _ctPredictorEntities = 0;
LevelChangePhase _lphCurrent = LCP_NOCHANGE; LevelChangePhase _lphCurrent = LCP_NOCHANGE;
BOOL _bTempNetwork = FALSE; // set while using temporary second network object BOOL _bTempNetwork = FALSE; // set while using temporary second network object
extern BOOL con_bCapture; extern BOOL con_bCapture;
extern CTString con_strCapture; extern CTString con_strCapture;
@ -93,7 +93,7 @@ INDEX ser_bClientsMayPause = TRUE;
FLOAT ser_tmSyncCheckFrequency = 1.0f; FLOAT ser_tmSyncCheckFrequency = 1.0f;
INDEX ser_iSyncCheckBuffer = 60; INDEX ser_iSyncCheckBuffer = 60;
INDEX ser_bEnumeration = TRUE; INDEX ser_bEnumeration = TRUE;
INDEX ser_bHeartbeatGameSpy = TRUE; INDEX ser_bPingGameAgent = TRUE;
FLOAT ser_tmKeepAlive = 0.1f; FLOAT ser_tmKeepAlive = 0.1f;
FLOAT ser_tmPingUpdate = 3.0f; FLOAT ser_tmPingUpdate = 3.0f;
INDEX ser_bWaitFirstPlayer = 0; INDEX ser_bWaitFirstPlayer = 0;