diff --git a/src/dehacked.c b/src/dehacked.c index 61c6969d5a2e4cd35b68d8543e1f560311941fc1..24a99d5d01bc90e8fac740acfef062b396cefdcf 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -2131,7 +2131,7 @@ static void readmenu(MYFILE *f, INT32 num) { menupres[num].tty = (INT16)get_number(word2); titlechanged = true; - } + } else if (fastcmp(word, "TITLEPICSLOOP")) { menupres[num].ttloop = (INT16)get_number(word2); @@ -3600,7 +3600,7 @@ static void readmaincfg(MYFILE *f) { tty = (INT16)get_number(word2); titlechanged = true; - } + } else if (fastcmp(word, "TITLEPICSLOOP")) { ttloop = (INT16)get_number(word2); diff --git a/src/f_finale.c b/src/f_finale.c index 8847f292458f1701331b61c44fac23071b0a171d..ace3e9a54dce7018ff2f52f3ff43b666ed5dff9c 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -2194,7 +2194,7 @@ void F_InitMenuPresValues(void) curbgxspeed = (gamestate == GS_TIMEATTACK) ? 0 : titlescrollxspeed; curbgyspeed = (gamestate == GS_TIMEATTACK) ? 22 : titlescrollyspeed; curbghide = (gamestate == GS_TIMEATTACK) ? false : true; - + curhidepics = hidetitlepics; curttmode = ttmode; curttscale = ttscale; @@ -2416,7 +2416,7 @@ void F_StartTitleScreen(void) ttspop6 = W_CachePatchName("TTSPOP6", PU_LEVEL); ttspop7 = W_CachePatchName("TTSPOP7", PU_LEVEL); break; - + // don't load alacroix gfx yet; we do that upon first draw. case TTMODE_ALACROIX: break; @@ -2438,7 +2438,7 @@ static void F_UnloadAlacroixGraphics(SINT8 oldttscale) // This all gets freed by PU_LEVEL when exiting the menus. // When re-visiting the menus (e.g., from exiting in-game), the gfx are force-reloaded. // So leftover addresses here should not be a problem. - + UINT16 i; oldttscale--; // zero-based index for (i = 0; i < TTMAX_ALACROIX; i++) @@ -2506,7 +2506,7 @@ static void F_LoadAlacroixGraphics(SINT8 newttscale) { for (j = 0; j < 22; j++) sprintf(&lumpnames[j][0], "T%.1hu%s", (UINT8)newttscale+1, names[j]); - + LOADTTGFX(ttembl[newttscale], lumpnames[0], TTMAX_ALACROIX) LOADTTGFX(ttribb[newttscale], lumpnames[1], TTMAX_ALACROIX) LOADTTGFX(ttsont[newttscale], lumpnames[2], TTMAX_ALACROIX) @@ -2665,7 +2665,7 @@ void F_TitleScreenDrawer(void) { // Ribbon unfurls, revealing SONIC text, from tic 0 to tic 24. SONIC text is pre-baked into this ribbon graphic. V_DrawSciencePatch(39<<FRACBITS, 88<<FRACBITS, 0, TTRIBB[min(max(0, finalecount), 24)], sc); - + // Animate SONIC text while the ribbon unfurls, from tic 0 to tic 28. if(finalecount >= 0) V_DrawSciencePatch(89<<FRACBITS, 92<<FRACBITS, 0, TTSONT[min(finalecount, 28)], sc); diff --git a/src/f_finale.h b/src/f_finale.h index 5d01880c4839d97387d64b5072c17da1c3d27eb8..f75f93c7745057f6b845054070af3a792bae6a3b 100644 --- a/src/f_finale.h +++ b/src/f_finale.h @@ -79,7 +79,7 @@ extern INT32 titlescrollyspeed; typedef enum { - TTMODE_NONE = 0, + TTMODE_NONE = 0, TTMODE_OLD, TTMODE_ALACROIX, TTMODE_USER diff --git a/src/m_menu.h b/src/m_menu.h index 6f27d64323912c1cc6a58ca167ffefcfd4003d9c..51c734a43c8a6199c37857a622c69c2a567113f7 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -143,7 +143,7 @@ typedef struct INT16 tty; // Y position of title wing INT16 ttloop; // # frame to loop; -1 means dont loop UINT16 tttics; // # of tics per frame - + char musname[7]; ///< Music track to play. "" for no music. UINT16 mustrack; ///< Subsong to play. Only really relevant for music modules and specific formats supported by GME. 0 to ignore. boolean muslooping; ///< Loop the music