From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 30 Sep 2002 03:37:53 +0000 (+0000)
Subject: fix changelevel, and simplify restart code
X-Git-Tag: RELEASE_0_2_0_RC1~168
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=de738b5be4e596e6e5a5c70d503ebce9a6b9b0bb;p=xonotic%2Fdarkplaces.git

fix changelevel, and simplify restart code


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2481 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/host_cmd.c b/host_cmd.c
index 652f1ce9..1ac4b6cb 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 int current_skill;
 char sv_spawnmap[MAX_QPATH];
 char sv_loadgame[MAX_OSPATH];
-int sv_restartmap;
 
 dfunction_t *ED_FindFunction (char *name);
 
@@ -300,7 +299,7 @@ void Host_Restart_f (void)
 
 	if (cmd_source != src_command)
 		return;
-	sv_restartmap = true;
+	strcpy (sv_spawnmap, sv.name);
 }
 
 /*
@@ -1601,17 +1600,11 @@ void Host_PerformSpawnServerAndLoadGame(void)
 	else if (sv_spawnmap[0])
 	{
 		SV_SpawnServer(sv_spawnmap);
-		if (sv.active && cls.state != ca_dedicated)
+		if (sv.active && cls.state == ca_disconnected)
 			Cmd_ExecuteString ("connect local", src_command);
 	}
-	else if (sv_restartmap)
-	{
-		strcpy(sv_spawnmap, sv.name);
-		SV_SpawnServer(sv_spawnmap);
-	}
 	sv_loadgame[0] = 0;
 	sv_spawnmap[0] = 0;
-	sv_restartmap = 0;
 }
 
 //=============================================================================