From e0a137b72565ee1d42f27c1f421c81f11ef0263d Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sat, 26 Jan 2013 03:28:54 +0000
Subject: [PATCH] - Removed the netdemo flag, because it's redundant with
 (netgame && demoplayback).

SVN r4050 (trunk)
---
 src/d_main.cpp  | 1 -
 src/g_game.cpp  | 6 ++----
 src/g_level.cpp | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index 2670dcf4e..50311c826 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -158,7 +158,6 @@ EXTERN_CVAR (Bool, sv_unlimited_pickup)
 
 extern int testingmode;
 extern bool setmodeneeded;
-extern bool netdemo;
 extern int NewWidth, NewHeight, NewBits, DisplayBits;
 EXTERN_CVAR (Bool, st_scale)
 extern bool gameisdead;
diff --git a/src/g_game.cpp b/src/g_game.cpp
index 6163ee0d6..fd8489f9a 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -164,7 +164,6 @@ CVAR(Bool, demo_compress, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
 FString			demoname;
 bool 			demorecording;
 bool 			demoplayback;
-bool 			netdemo;
 bool			demonew;				// [RH] Only used around G_InitNew for demos
 int				demover;
 BYTE*			demobuffer;
@@ -1131,7 +1130,7 @@ void G_Ticker ()
 				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;
 				if (gametic > BACKUPTICS*ticdup && consistancy[i][buf] != cmd->consistancy)
@@ -2503,7 +2502,7 @@ bool G_ProcessIFFDemo (char *mapname)
 	}
 
 	if (numPlayers > 1)
-		multiplayer = netgame = netdemo = true;
+		multiplayer = netgame = true;
 
 	if (uncompSize > 0)
 	{
@@ -2641,7 +2640,6 @@ bool G_CheckDemoStatus (void)
 
 		P_SetupWeapons_ntohton();
 		demoplayback = false;
-		netdemo = false;
 		netgame = false;
 		multiplayer = false;
 		singletics = false;
diff --git a/src/g_level.cpp b/src/g_level.cpp
index 24c43defd..27be03b08 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -114,7 +114,6 @@ extern bool timingdemo;
 int starttime;
 
 
-extern bool netdemo;
 extern FString BackupSaveName;
 
 bool savegamerestore;
@@ -230,7 +229,6 @@ void G_NewInit ()
 	G_ClearSnapshots ();
 	SB_state = screen->GetPageCount ();
 	netgame = false;
-	netdemo = false;
 	multiplayer = false;
 	if (demoplayback)
 	{