From d38886552c6f55131e2a1a36026db63570dc3211 Mon Sep 17 00:00:00 2001
From: Yukita Mayako <catgirl@goddess.moe>
Date: Thu, 10 Mar 2016 18:36:00 -0500
Subject: [PATCH] HACK XD_MAP after XD_EXITLEVEL hack
---
src/d_netcmd.c | 2 +-
src/f_finale.c | 5 +----
src/g_game.c | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 386ba5d092..2efd7947f6 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1507,7 +1507,7 @@ void D_MapChange(INT32 mapnum, INT32 newgametype, boolean pultmode, boolean rese
mapchangepending = 0;
// spawn the server if needed
// reset players if there is a new one
- if (!(adminplayer == consoleplayer) && SV_SpawnServer())
+ if (server && SV_SpawnServer())
buf[0] &= ~(1<<1);
// Kick bot from special stages
diff --git a/src/f_finale.c b/src/f_finale.c
index 507616f3ca..dae2ed57fb 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1721,10 +1721,7 @@ static void F_AdvanceToNextScene(void)
void F_EndCutScene(void)
{
if (runningprecutscene)
- {
- if (server)
- D_MapChange(gamemap, gametype, ultimatemode, precutresetplayer, 0, true, false);
- }
+ D_MapChange(gamemap, gametype, ultimatemode, precutresetplayer, 0, true, false);
else
{
if (cutnum == creditscutscene-1)
diff --git a/src/g_game.c b/src/g_game.c
index e763c1e908..737f931603 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2866,7 +2866,7 @@ void G_NextLevel(void)
static void G_DoWorldDone(void)
{
- if (server)
+ //if (server)
{
if (gametype == GT_COOP)
// don't reset player between maps
--
GitLab