From 58516ebe104c265066bab3ec8dd84dadb9c99c5b Mon Sep 17 00:00:00 2001
From: Matt Walsh <MattWCSTRFAN@gmail.com>
Date: Fri, 2 Jan 2015 22:27:43 +0000
Subject: [PATCH] Well that shows you how much we care about the old special
stages *or* race!
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8985 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
---
src/g_game.c | 3 +--
src/st_stuff.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/g_game.c b/src/g_game.c
index c59f23c078..931388d874 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2180,8 +2180,7 @@ void G_PlayerReborn(INT32 player)
p->health = 1; // 0 rings
p->panim = PA_IDLE; // standing animation
- if ((netgame || multiplayer) && !p->spectator
- && gametype != GT_RACE)
+ if ((netgame || multiplayer) && !p->spectator)
p->powers[pw_flashing] = flashingtics-1; // Babysitting deterrent
if (p-players == consoleplayer)
diff --git a/src/st_stuff.c b/src/st_stuff.c
index a9bdacf715..6e19b92ff0 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1590,7 +1590,7 @@ static void ST_drawSpecialStageHUD(void)
if (sstimer)
{
V_DrawString(hudinfo[HUD_TIMELEFT].x, STRINGY(hudinfo[HUD_TIMELEFT].y), V_HUDTRANS, M_GetText("TIME LEFT"));
- ST_DrawNightsOverlayNum(SCX(hudinfo[HUD_TIMELEFTNUM].x), SCY(hudinfo[HUD_TIMELEFTNUM].y), V_HUDTRANS, sstimer/TICRATE, tallnum, SKINCOLOR_WHITE);
+ ST_DrawNumFromHud(HUD_TIMELEFTNUM, sstimer/TICRATE);
}
else
ST_DrawPatchFromHud(HUD_TIMEUP, timeup);
--
GitLab