Skip to content
Permalink
Browse files

bring par time handling for non-official maps more in line with Choco

  • Loading branch information...
fabiangreffrath committed Jun 11, 2019
1 parent b8afe71 commit 0202ff186b3503b13d49c384e1bcadc38dba9223
Showing with 5 additions and 8 deletions.
  1. +3 −7 src/doom/g_game.c
  2. +2 −1 src/doom/wi_stuff.c
@@ -1780,12 +1780,7 @@ void G_DoCompleted (void)
wminfo.maxsecret = totalsecret;
wminfo.maxfrags = 0;

if (gamemap == 33 || (crispy->havee1m10 && gameepisode == 1 && gamemap == 10))
{
// [crispy] par time for inofficial maps sucks
wminfo.partime = INT_MAX;
}
else
// [crispy] single player par times for NRFTL
if (gamemission == pack_nerve && crispy->singleplayer)
{
wminfo.partime = TICRATE*npars[gamemap-1];
@@ -1796,7 +1791,7 @@ void G_DoCompleted (void)
if (gamemode == commercial)
{
// map33 has no official time: initialize to zero
if (gamemap == 33 && false) // [crispy] disable
if (gamemap == 33)
{
wminfo.partime = 0;
}
@@ -1823,6 +1818,7 @@ void G_DoCompleted (void)
else
wminfo.partime = TICRATE*pars[gameepisode][gamemap];
}
// [crispy] single player par times for episode 4
else if (gameepisode == 4 && crispy->singleplayer)
{
wminfo.partime = TICRATE*e4pars[gamemap];
@@ -391,6 +391,7 @@ static patch_t* bp[MAXPLAYERS];

// Name graphics of each level (centered)
static patch_t** lnames;
// [crispy] prevent crashes with maps without map title graphics lump
static unsigned int num_lnames;

// Buffer storing the backdrop
@@ -1586,7 +1587,7 @@ void WI_drawStats(void)
V_DrawPatch(ORIGWIDTH/2 + SP_TIMEX, SP_TIMEY, par);

// Emulation: don't draw partime value if map33
if (true || gamemode != commercial || wbs->last != NUMCMAPS) // [crispy] always show
if (gamemode != commercial || wbs->last != NUMCMAPS)
{
WI_drawTime(ORIGWIDTH - SP_TIMEX, SP_TIMEY, cnt_par, true);
}

0 comments on commit 0202ff1

Please sign in to comment.
You can’t perform that action at this time.