stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-17 23:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

That's a lot of whitespace

Browse source
This commit is contained in:
James R 2019-11-07 13:42:54 -08:00
parent 43fff92c82
commit 872e662618
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dehacked.c
View file

@ -2131,7 +2131,7 @@ static void readmenu(MYFILE *f, INT32 num)
{ {
menupres[num].tty = (INT16)get_number(word2); menupres[num].tty = (INT16)get_number(word2);
titlechanged = true; titlechanged = true;
} }
else if (fastcmp(word, "TITLEPICSLOOP")) else if (fastcmp(word, "TITLEPICSLOOP"))
{ {
menupres[num].ttloop = (INT16)get_number(word2); menupres[num].ttloop = (INT16)get_number(word2);
@ -3600,7 +3600,7 @@ static void readmaincfg(MYFILE *f)
{ {
tty = (INT16)get_number(word2); tty = (INT16)get_number(word2);
titlechanged = true; titlechanged = true;
} }
else if (fastcmp(word, "TITLEPICSLOOP")) else if (fastcmp(word, "TITLEPICSLOOP"))
{ {
ttloop = (INT16)get_number(word2); ttloop = (INT16)get_number(word2);

10
src/f_finale.c
View file

@ -2194,7 +2194,7 @@ void F_InitMenuPresValues(void)
curbgxspeed = (gamestate == GS_TIMEATTACK) ? 0 : titlescrollxspeed; curbgxspeed = (gamestate == GS_TIMEATTACK) ? 0 : titlescrollxspeed;
curbgyspeed = (gamestate == GS_TIMEATTACK) ? 22 : titlescrollyspeed; curbgyspeed = (gamestate == GS_TIMEATTACK) ? 22 : titlescrollyspeed;
curbghide = (gamestate == GS_TIMEATTACK) ? false : true; curbghide = (gamestate == GS_TIMEATTACK) ? false : true;
curhidepics = hidetitlepics; curhidepics = hidetitlepics;
curttmode = ttmode; curttmode = ttmode;
curttscale = ttscale; curttscale = ttscale;
@ -2416,7 +2416,7 @@ void F_StartTitleScreen(void)
ttspop6 = W_CachePatchName("TTSPOP6", PU_LEVEL); ttspop6 = W_CachePatchName("TTSPOP6", PU_LEVEL);
ttspop7 = W_CachePatchName("TTSPOP7", PU_LEVEL); ttspop7 = W_CachePatchName("TTSPOP7", PU_LEVEL);
break; break;
// don't load alacroix gfx yet; we do that upon first draw. // don't load alacroix gfx yet; we do that upon first draw.
case TTMODE_ALACROIX: case TTMODE_ALACROIX:
break; break;
@ -2438,7 +2438,7 @@ static void F_UnloadAlacroixGraphics(SINT8 oldttscale)
// This all gets freed by PU_LEVEL when exiting the menus. // 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. // 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. // So leftover addresses here should not be a problem.
UINT16 i; UINT16 i;
oldttscale--; // zero-based index oldttscale--; // zero-based index
for (i = 0; i < TTMAX_ALACROIX; i++) for (i = 0; i < TTMAX_ALACROIX; i++)
@ -2506,7 +2506,7 @@ static void F_LoadAlacroixGraphics(SINT8 newttscale)
{ {
for (j = 0; j < 22; j++) for (j = 0; j < 22; j++)
sprintf(&lumpnames[j][0], "T%.1hu%s", (UINT8)newttscale+1, names[j]); sprintf(&lumpnames[j][0], "T%.1hu%s", (UINT8)newttscale+1, names[j]);
LOADTTGFX(ttembl[newttscale], lumpnames[0], TTMAX_ALACROIX) LOADTTGFX(ttembl[newttscale], lumpnames[0], TTMAX_ALACROIX)
LOADTTGFX(ttribb[newttscale], lumpnames[1], TTMAX_ALACROIX) LOADTTGFX(ttribb[newttscale], lumpnames[1], TTMAX_ALACROIX)
LOADTTGFX(ttsont[newttscale], lumpnames[2], 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. // 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); 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. // Animate SONIC text while the ribbon unfurls, from tic 0 to tic 28.
if(finalecount >= 0) if(finalecount >= 0)
V_DrawSciencePatch(89<<FRACBITS, 92<<FRACBITS, 0, TTSONT[min(finalecount, 28)], sc); V_DrawSciencePatch(89<<FRACBITS, 92<<FRACBITS, 0, TTSONT[min(finalecount, 28)], sc);

2
src/f_finale.h
View file

@ -79,7 +79,7 @@ extern INT32 titlescrollyspeed;
typedef enum typedef enum
{ {
TTMODE_NONE = 0, TTMODE_NONE = 0,
TTMODE_OLD, TTMODE_OLD,
TTMODE_ALACROIX, TTMODE_ALACROIX,
TTMODE_USER TTMODE_USER

2
src/m_menu.h
View file

@ -143,7 +143,7 @@ typedef struct
INT16 tty; // Y position of title wing INT16 tty; // Y position of title wing
INT16 ttloop; // # frame to loop; -1 means dont loop INT16 ttloop; // # frame to loop; -1 means dont loop
UINT16 tttics; // # of tics per frame UINT16 tttics; // # of tics per frame
char musname[7]; ///< Music track to play. "" for no music. 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. 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 boolean muslooping; ///< Loop the music