Fix a few basic mistakes.

* Don't forcibly go to a race map if you're exiting a boss and would otherwise return to the title screen.
* Yes, there are four basc TOL's now, not three.
* Title card string for ZONE should be right aligned.
This commit is contained in:
toaster 2022-02-27 17:07:56 +00:00
parent c1f3237157
commit 4a2efd3000
3 changed files with 3 additions and 3 deletions

View file

@ -509,7 +509,7 @@ enum TypeOfLevel
}; };
#define MAXTOL (1<<31) #define MAXTOL (1<<31)
#define NUMBASETOLNAMES (3) #define NUMBASETOLNAMES (4)
#define NUMTOLNAMES (NUMBASETOLNAMES + NUMGAMETYPEFREESLOTS) #define NUMTOLNAMES (NUMBASETOLNAMES + NUMGAMETYPEFREESLOTS)
typedef struct typedef struct

View file

@ -3581,7 +3581,7 @@ static void G_DoCompleted(void)
// a map of the proper gametype -- skip levels that don't support // a map of the proper gametype -- skip levels that don't support
// the current gametype. (Helps avoid playing boss levels in Race, // the current gametype. (Helps avoid playing boss levels in Race,
// for instance). // for instance).
if (!modeattacking && grandprixinfo.gp == false) if (!modeattacking && grandprixinfo.gp == false && bossinfo.boss == false)
{ {
if (nextmap >= 0 && nextmap < NUMMAPS) if (nextmap >= 0 && nextmap < NUMMAPS)
{ {

View file

@ -1117,7 +1117,7 @@ void ST_drawTitleCard(void)
V_DrawTitleCardString((actnum) ? 265 : 280, 60, lvlttl, V_SNAPTORIGHT, false, lt_ticker, TTANIMENDTHRESHOLD); V_DrawTitleCardString((actnum) ? 265 : 280, 60, lvlttl, V_SNAPTORIGHT, false, lt_ticker, TTANIMENDTHRESHOLD);
if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE)) if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
V_DrawTitleCardString((actnum) ? 265 : 280, 60+32, strlen(zonttl) ? zonttl : "ZONE", false, false, lt_ticker - strlen(lvlttl), TTANIMENDTHRESHOLD); V_DrawTitleCardString((actnum) ? 265 : 280, 60+32, strlen(zonttl) ? zonttl : "ZONE", V_SNAPTORIGHT, false, lt_ticker - strlen(lvlttl), TTANIMENDTHRESHOLD);
// the act has a similar graphic animation, but we'll handle it here since it's only like 2 graphics lmfao. // the act has a similar graphic animation, but we'll handle it here since it's only like 2 graphics lmfao.
if (actnum && actnum < 10) if (actnum && actnum < 10)