From 68cc982a108f3fcfbeda1f218bc1ab78b18164af Mon Sep 17 00:00:00 2001 From: sezero Date: Sat, 2 Mar 2013 10:29:26 +0000 Subject: [PATCH] host_cmd.c (Host_Changelevel_f, Host_Restart_f): if the serverspawn fails even with an existing map, issue a Host_Error(). git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@827 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Quake/host_cmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/quakespasm/Quake/host_cmd.c b/quakespasm/Quake/host_cmd.c index 94bce8ba..c199ce73 100644 --- a/quakespasm/Quake/host_cmd.c +++ b/quakespasm/Quake/host_cmd.c @@ -890,6 +890,9 @@ void Host_Changelevel_f (void) SV_SaveSpawnparms (); q_strlcpy (level, Cmd_Argv(1), sizeof(level)); SV_SpawnServer (level); + // also issue an error if spawn failed -- O.S. + if (!sv.active) + Host_Error ("cannot run map %s", level); } /* @@ -908,9 +911,10 @@ void Host_Restart_f (void) if (cmd_source != src_command) return; - q_strlcpy (mapname, sv.name, sizeof(mapname)); // must copy out, because it gets cleared - // in sv_spawnserver + q_strlcpy (mapname, sv.name, sizeof(mapname)); // mapname gets cleared in spawnserver SV_SpawnServer (mapname); + if (!sv.active) + Host_Error ("cannot restart map %s", level); } /*