diff --git a/src/g_game.c b/src/g_game.c
index 7a876e968542b8f47e71198d47665e6e5916976a..a3025f9491f2b2c756229c275ae55916b5f82b7c 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2100,7 +2100,7 @@ static inline void G_PlayerFinishLevel(INT32 player)
// G_PlayerReborn
// Called after a player dies. Almost everything is cleared and initialized.
//
-void G_PlayerReborn(INT32 player)
+void G_PlayerReborn(INT32 player, boolean betweenmaps)
{
player_t *p;
INT32 score;
@@ -2205,7 +2205,7 @@ void G_PlayerReborn(INT32 player)
bot = players[player].bot;
pity = players[player].pity;
- if (!G_IsSpecialStage(gamemap))
+ if (betweenmaps || !G_IsSpecialStage(gamemap))
{
rings = (ultimatemode ? 0 : mapheaderinfo[gamemap-1]->startrings);
spheres = 0;
@@ -2284,6 +2284,28 @@ void G_PlayerReborn(INT32 player)
//if ((netgame || multiplayer) && !p->spectator) -- moved into P_SpawnPlayer to account for forced changes there
//p->powers[pw_flashing] = flashingtics-1; // Babysitting deterrent
+ // Check to make sure their color didn't change somehow...
+ if (G_GametypeHasTeams())
+ {
+ if (p->ctfteam == 1 && p->skincolor != skincolor_redteam)
+ {
+ if (p == &players[consoleplayer])
+ CV_SetValue(&cv_playercolor, skincolor_redteam);
+ else if (p == &players[secondarydisplayplayer])
+ CV_SetValue(&cv_playercolor2, skincolor_redteam);
+ }
+ else if (p->ctfteam == 2 && p->skincolor != skincolor_blueteam)
+ {
+ if (p == &players[consoleplayer])
+ CV_SetValue(&cv_playercolor, skincolor_blueteam);
+ else if (p == &players[secondarydisplayplayer])
+ CV_SetValue(&cv_playercolor2, skincolor_blueteam);
+ }
+ }
+
+ if (betweenmaps)
+ return;
+
if (p-players == consoleplayer)
{
if (mapmusflags & MUSIC_RELOADRESET)
@@ -2303,9 +2325,6 @@ void G_PlayerReborn(INT32 player)
if (gametype == GT_COOP)
P_FindEmerald(); // scan for emeralds to hunt for
- // Reset Nights score and max link to 0 on death
- p->marescore = p->maxlink = 0;
-
// If NiGHTS, find lowest mare to start with.
p->mare = P_FindLowestMare();
@@ -2313,27 +2332,6 @@ void G_PlayerReborn(INT32 player)
if (p->mare == 255)
p->mare = 0;
-
- p->marelap = p->marebonuslap = 0;
-
- // Check to make sure their color didn't change somehow...
- if (G_GametypeHasTeams())
- {
- if (p->ctfteam == 1 && p->skincolor != skincolor_redteam)
- {
- if (p == &players[consoleplayer])
- CV_SetValue(&cv_playercolor, skincolor_redteam);
- else if (p == &players[secondarydisplayplayer])
- CV_SetValue(&cv_playercolor2, skincolor_redteam);
- }
- else if (p->ctfteam == 2 && p->skincolor != skincolor_blueteam)
- {
- if (p == &players[consoleplayer])
- CV_SetValue(&cv_playercolor, skincolor_blueteam);
- else if (p == &players[secondarydisplayplayer])
- CV_SetValue(&cv_playercolor2, skincolor_blueteam);
- }
- }
}
//
diff --git a/src/g_game.h b/src/g_game.h
index e161bc8ed4a7cf11eefe93bbf6715825426b582c..df1301dd7c392071a14fa66870c9f8fc7f099883 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -100,7 +100,7 @@ extern INT32 localaiming, localaiming2; // should be an angle_t but signed
//
void G_ChangePlayerReferences(mobj_t *oldmo, mobj_t *newmo);
void G_DoReborn(INT32 playernum);
-void G_PlayerReborn(INT32 player);
+void G_PlayerReborn(INT32 player, boolean betweenmaps);
void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer,
boolean skipprecutscene, boolean FLS);
char *G_BuildMapTitle(INT32 mapnum);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 236347eae56087ea6a7ac2ea6eba86b432dac880..994ddcfe704c934a658a92917adc9b19d76de983 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -10432,7 +10432,7 @@ void P_SpawnPlayer(INT32 playernum)
mobj_t *mobj;
if (p->playerstate == PST_REBORN)
- G_PlayerReborn(playernum);
+ G_PlayerReborn(playernum, false);
// spawn as spectator determination
if (!G_GametypeHasSpectators())
diff --git a/src/p_setup.c b/src/p_setup.c
index 0753f01d3840c965974115b31534b2643cb9237e..c83c8cd5cefaefecbb763c15f7a5742d64ea8cf5 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2246,6 +2246,8 @@ static void P_LevelInitStuff(void)
for (i = 0; i < MAXPLAYERS; i++)
{
+ G_PlayerReborn(i, true);
+
if (canresetlives && (netgame || multiplayer) && playeringame[i] && (gametype == GT_COMPETITION || players[i].lives <= 0))
{
// In Co-Op, replenish a user's lives if they are depleted.
@@ -2253,42 +2255,18 @@ static void P_LevelInitStuff(void)
}
// obliteration station...
- players[i].spheres =\
- players[i].xtralife = players[i].deadtimer =\
- players[i].numboxes = players[i].totalring =\
- players[i].laps = players[i].aiming =\
- players[i].losstime = players[i].timeshit =\
- players[i].marescore = players[i].lastmarescore =\
- players[i].maxlink = players[i].startedtime =\
- players[i].finishedtime = players[i].finishedspheres =\
- players[i].finishedrings = players[i].lastmare =\
- players[i].lastmarelap = players[i].lastmarebonuslap =\
- players[i].totalmarelap = players[i].totalmarebonuslap =\
- players[i].marebegunat = players[i].textvar =\
- players[i].texttimer = players[i].linkcount =\
- players[i].linktimer = players[i].flyangle =\
- players[i].anotherflyangle = players[i].nightstime =\
- players[i].oldscale = players[i].mare = players[i].marelap =\
- players[i].marebonuslap = players[i].lapbegunat =\
- players[i].lapstartedtime = players[i].totalmarescore =\
- players[i].realtime = players[i].exiting = 0;
-
- // i guess this could be part of the above but i feel mildly uncomfortable implicitly casting
- players[i].gotcontinue = false;
-
- // aha, the first evidence this shouldn't be a memset!
+ players[i].numboxes = players[i].totalring =\
+ players[i].laps = players[i].marescore = players[i].lastmarescore =\
+ players[i].mare = players[i].exiting = 0;
+
players[i].drillmeter = 40*20;
- players[i].rings = (ultimatemode ? 0 : mapheaderinfo[gamemap-1]->startrings);
- P_ResetPlayer(&players[i]);
// hit these too
- players[i].pflags &= ~(PF_GAMETYPEOVER|PF_TRANSFERTOCLOSEST);
-
- // unset ALL the pointers. P_SetTarget isn't needed here because if this
- // function is being called we're just going to clobber the data anyways
- players[i].mo = players[i].followmobj = players[i].awayviewmobj =\
- players[i].capsule = players[i].axis1 = players[i].axis2 = players[i].drone = NULL;
+ players[i].pflags &= ~(PF_GAMETYPEOVER);
}
+
+ if (botingame)
+ CV_SetValue(&cv_analog2, true);
}
//