zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-12 23:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Removed the netdemo flag, because it's redundant with (netgame && demoplayback).

Browse source 
SVN r4050 (trunk)
This commit is contained in:
Randy Heit 2013-01-26 03:28:54 +00:00
parent 83320626e5
commit e0a137b725
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_main.cpp
View file

@ -158,7 +158,6 @@ EXTERN_CVAR (Bool, sv_unlimited_pickup)
extern int testingmode; extern int testingmode;
extern bool setmodeneeded; extern bool setmodeneeded;
extern bool netdemo;
extern int NewWidth, NewHeight, NewBits, DisplayBits; extern int NewWidth, NewHeight, NewBits, DisplayBits;
EXTERN_CVAR (Bool, st_scale) EXTERN_CVAR (Bool, st_scale)
extern bool gameisdead; extern bool gameisdead;

6
src/g_game.cpp
View file

@ -164,7 +164,6 @@ CVAR(Bool, demo_compress, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
FString demoname; FString demoname;
bool demorecording; bool demorecording;
bool demoplayback; bool demoplayback;
bool netdemo;
bool demonew; // [RH] Only used around G_InitNew for demos bool demonew; // [RH] Only used around G_InitNew for demos
int demover; int demover;
BYTE* demobuffer; BYTE* demobuffer;
@ -1131,7 +1130,7 @@ void G_Ticker ()
Printf ("%s is turbo!\n", players[i].userinfo.netname); Printf ("%s is turbo!\n", players[i].userinfo.netname);
} }
if (netgame && !players[i].isbot && !netdemo && (gametic%ticdup) == 0) if (netgame && !players[i].isbot && !demoplayback && (gametic%ticdup) == 0)
{ {
//players[i].inconsistant = 0; //players[i].inconsistant = 0;
if (gametic > BACKUPTICS*ticdup && consistancy[i][buf] != cmd->consistancy) if (gametic > BACKUPTICS*ticdup && consistancy[i][buf] != cmd->consistancy)
@ -2503,7 +2502,7 @@ bool G_ProcessIFFDemo (char *mapname)
} }
if (numPlayers > 1) if (numPlayers > 1)
multiplayer = netgame = netdemo = true; multiplayer = netgame = true;
if (uncompSize > 0) if (uncompSize > 0)
{ {
@ -2641,7 +2640,6 @@ bool G_CheckDemoStatus (void)
P_SetupWeapons_ntohton(); P_SetupWeapons_ntohton();
demoplayback = false; demoplayback = false;
netdemo = false;
netgame = false; netgame = false;
multiplayer = false; multiplayer = false;
singletics = false; singletics = false;

2
src/g_level.cpp
View file

@ -114,7 +114,6 @@ extern bool timingdemo;
int starttime; int starttime;
extern bool netdemo;
extern FString BackupSaveName; extern FString BackupSaveName;
bool savegamerestore; bool savegamerestore;
@ -230,7 +229,6 @@ void G_NewInit ()
G_ClearSnapshots (); G_ClearSnapshots ();
SB_state = screen->GetPageCount (); SB_state = screen->GetPageCount ();
netgame = false; netgame = false;
netdemo = false;
multiplayer = false; multiplayer = false;
if (demoplayback) if (demoplayback)
{ {