lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove TTCOUNTERSET to simplify custom title SOC

This commit is contained in:
mazmazz 2019-11-02 12:40:12 -04:00
parent 1ebcdb5344
commit fc02b73534
5 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dehacked.c
View File

@ -2116,11 +2116,6 @@ static void readmenu(MYFILE *f, INT32 num)
menupres[num].ttscale = max(1, min(8, (UINT8)get_number(word2)));
titlechanged = true;
}
else if (fastcmp(word, "TITLEPICSCOUNTERSET"))
{
menupres[num].ttcounterset = (INT32)get_number(word2);
titlechanged = true;
}
else if (fastcmp(word, "TITLEPICSNAME"))
{
strncpy(menupres[num].ttname, word2, 9);
@ -3569,11 +3564,6 @@ static void readmaincfg(MYFILE *f)
ttscale = max(1, min(8, (UINT8)get_number(word2)));
titlechanged = true;
}
else if (fastcmp(word, "TITLEPICSCOUNTERSET"))
{
ttcounterset = (INT32)get_number(word2);
titlechanged = true;
}
else if (fastcmp(word, "TITLEPICSNAME"))
{
strncpy(ttname, word2, 9);

3
src/f_finale.c
View File

@ -84,7 +84,6 @@ static UINT32 demoIdleLeft;
ttmode_enum ttmode = TTMODE_OLD;
UINT8 ttscale = 1; // FRACUNIT / ttscale
INT32 ttcounterset = -1;
// ttmode user vars
char ttname[9];
INT16 ttx = 0;
@ -95,7 +94,6 @@ UINT16 tttics = 1;
boolean curhidepics;
ttmode_enum curttmode;
UINT8 curttscale;
INT32 curttcounterset;
// ttmode user vars
char curttname[9];
INT16 curttx;
@ -2153,7 +2151,6 @@ void F_InitMenuPresValues(void)
curhidepics = hidetitlepics;
curttmode = ttmode;
curttscale = ttscale;
curttcounterset = ttcounterset;
strncpy(curttname, ttname, 9);
curttx = ttx;
curtty = tty;

2
src/f_finale.h
View File

@ -90,7 +90,6 @@ typedef enum
extern ttmode_enum ttmode;
extern UINT8 ttscale;
extern INT32 ttcounterset;
// ttmode user vars
extern char ttname[9];
extern INT16 ttx;
@ -119,7 +118,6 @@ extern boolean hidetitlemap;
extern boolean curhidepics;
extern ttmode_enum curttmode;
extern UINT8 curttscale;
extern INT32 curttcounterset;
// ttmode user vars
extern char curttname[9];
extern INT16 curttx;

5
src/m_menu.c
View File

@ -2291,7 +2291,6 @@ void M_InitMenuPresTables(void)
menupres[i].hidetitlepics = -1; // inherits global hidetitlepics
menupres[i].ttmode = TTMODE_NONE;
menupres[i].ttscale = UINT8_MAX;
menupres[i].ttcounterset = INT32_MAX;
menupres[i].ttname[0] = 0;
menupres[i].ttx = INT16_MAX;
menupres[i].tty = INT16_MAX;
@ -2496,7 +2495,6 @@ static boolean MIT_SetCurTitlePics(UINT32 menutype, INT32 level, INT32 *retval,
curhidepics = menupres[menutype].hidetitlepics;
curttmode = menupres[menutype].ttmode;
curttscale = (menupres[menutype].ttscale != UINT8_MAX ? menupres[menutype].ttscale : ttscale);
curttcounterset = (menupres[menutype].ttcounterset != INT32_MAX ? menupres[menutype].ttcounterset : ttcounterset);
strncpy(curttname, menupres[menutype].ttname, 9);
curttx = (menupres[menutype].ttx != INT16_MAX ? menupres[menutype].ttx : ttx);
curtty = (menupres[menutype].tty != INT16_MAX ? menupres[menutype].tty : tty);
@ -2512,7 +2510,6 @@ static boolean MIT_SetCurTitlePics(UINT32 menutype, INT32 level, INT32 *retval,
curhidepics = menupres[menutype].hidetitlepics;
curttmode = menupres[menutype].ttmode;
curttscale = (menupres[menutype].ttscale != UINT8_MAX ? menupres[menutype].ttscale : ttscale);
curttcounterset = (menupres[menutype].ttcounterset != INT32_MAX ? menupres[menutype].ttcounterset : ttcounterset);
return true;
}
else if (!level)
@ -2520,7 +2517,6 @@ static boolean MIT_SetCurTitlePics(UINT32 menutype, INT32 level, INT32 *retval,
curhidepics = hidetitlepics;
curttmode = ttmode;
curttscale = ttscale;
curttcounterset = ttcounterset;
strncpy(curttname, ttname, 9);
curttx = ttx;
curtty = tty;
@ -2625,7 +2621,6 @@ static void M_HandleMenuPresState(menu_t *newMenu)
curttmode = ttmode;
curttscale = ttscale;
curttcounterset = ttcounterset;
strncpy(curttname, ttname, 9);
curttx = ttx;
curtty = tty;

1
src/m_menu.h
View File

@ -138,7 +138,6 @@ typedef struct
SINT8 hidetitlepics; // hide title gfx per menu; -1 means undefined, inherits global setting
ttmode_enum ttmode; // title wing animation mode; default TTMODE_OLD
UINT8 ttscale; // scale of title wing gfx (FRACUNIT / ttscale); -1 means undefined, inherits global setting
INT32 ttcounterset; // Value to reset animation counter to on subsequent menu viewings.
char ttname[9]; // lump name of title wing gfx. If name length is <= 6, engine will attempt to load numbered frames (TTNAMExx)
INT16 ttx; // X position of title wing
INT16 tty; // Y position of title wing