Remove TTCOUNTERSET to simplify custom title SOC
This commit is contained in:
parent
1ebcdb5344
commit
fc02b73534
|
@ -2116,11 +2116,6 @@ static void readmenu(MYFILE *f, INT32 num)
|
||||||
menupres[num].ttscale = max(1, min(8, (UINT8)get_number(word2)));
|
menupres[num].ttscale = max(1, min(8, (UINT8)get_number(word2)));
|
||||||
titlechanged = true;
|
titlechanged = true;
|
||||||
}
|
}
|
||||||
else if (fastcmp(word, "TITLEPICSCOUNTERSET"))
|
|
||||||
{
|
|
||||||
menupres[num].ttcounterset = (INT32)get_number(word2);
|
|
||||||
titlechanged = true;
|
|
||||||
}
|
|
||||||
else if (fastcmp(word, "TITLEPICSNAME"))
|
else if (fastcmp(word, "TITLEPICSNAME"))
|
||||||
{
|
{
|
||||||
strncpy(menupres[num].ttname, word2, 9);
|
strncpy(menupres[num].ttname, word2, 9);
|
||||||
|
@ -3569,11 +3564,6 @@ static void readmaincfg(MYFILE *f)
|
||||||
ttscale = max(1, min(8, (UINT8)get_number(word2)));
|
ttscale = max(1, min(8, (UINT8)get_number(word2)));
|
||||||
titlechanged = true;
|
titlechanged = true;
|
||||||
}
|
}
|
||||||
else if (fastcmp(word, "TITLEPICSCOUNTERSET"))
|
|
||||||
{
|
|
||||||
ttcounterset = (INT32)get_number(word2);
|
|
||||||
titlechanged = true;
|
|
||||||
}
|
|
||||||
else if (fastcmp(word, "TITLEPICSNAME"))
|
else if (fastcmp(word, "TITLEPICSNAME"))
|
||||||
{
|
{
|
||||||
strncpy(ttname, word2, 9);
|
strncpy(ttname, word2, 9);
|
||||||
|
|
|
@ -84,7 +84,6 @@ static UINT32 demoIdleLeft;
|
||||||
|
|
||||||
ttmode_enum ttmode = TTMODE_OLD;
|
ttmode_enum ttmode = TTMODE_OLD;
|
||||||
UINT8 ttscale = 1; // FRACUNIT / ttscale
|
UINT8 ttscale = 1; // FRACUNIT / ttscale
|
||||||
INT32 ttcounterset = -1;
|
|
||||||
// ttmode user vars
|
// ttmode user vars
|
||||||
char ttname[9];
|
char ttname[9];
|
||||||
INT16 ttx = 0;
|
INT16 ttx = 0;
|
||||||
|
@ -95,7 +94,6 @@ UINT16 tttics = 1;
|
||||||
boolean curhidepics;
|
boolean curhidepics;
|
||||||
ttmode_enum curttmode;
|
ttmode_enum curttmode;
|
||||||
UINT8 curttscale;
|
UINT8 curttscale;
|
||||||
INT32 curttcounterset;
|
|
||||||
// ttmode user vars
|
// ttmode user vars
|
||||||
char curttname[9];
|
char curttname[9];
|
||||||
INT16 curttx;
|
INT16 curttx;
|
||||||
|
@ -2153,7 +2151,6 @@ void F_InitMenuPresValues(void)
|
||||||
curhidepics = hidetitlepics;
|
curhidepics = hidetitlepics;
|
||||||
curttmode = ttmode;
|
curttmode = ttmode;
|
||||||
curttscale = ttscale;
|
curttscale = ttscale;
|
||||||
curttcounterset = ttcounterset;
|
|
||||||
strncpy(curttname, ttname, 9);
|
strncpy(curttname, ttname, 9);
|
||||||
curttx = ttx;
|
curttx = ttx;
|
||||||
curtty = tty;
|
curtty = tty;
|
||||||
|
|
|
@ -90,7 +90,6 @@ typedef enum
|
||||||
|
|
||||||
extern ttmode_enum ttmode;
|
extern ttmode_enum ttmode;
|
||||||
extern UINT8 ttscale;
|
extern UINT8 ttscale;
|
||||||
extern INT32 ttcounterset;
|
|
||||||
// ttmode user vars
|
// ttmode user vars
|
||||||
extern char ttname[9];
|
extern char ttname[9];
|
||||||
extern INT16 ttx;
|
extern INT16 ttx;
|
||||||
|
@ -119,7 +118,6 @@ extern boolean hidetitlemap;
|
||||||
extern boolean curhidepics;
|
extern boolean curhidepics;
|
||||||
extern ttmode_enum curttmode;
|
extern ttmode_enum curttmode;
|
||||||
extern UINT8 curttscale;
|
extern UINT8 curttscale;
|
||||||
extern INT32 curttcounterset;
|
|
||||||
// ttmode user vars
|
// ttmode user vars
|
||||||
extern char curttname[9];
|
extern char curttname[9];
|
||||||
extern INT16 curttx;
|
extern INT16 curttx;
|
||||||
|
|
|
@ -2291,7 +2291,6 @@ void M_InitMenuPresTables(void)
|
||||||
menupres[i].hidetitlepics = -1; // inherits global hidetitlepics
|
menupres[i].hidetitlepics = -1; // inherits global hidetitlepics
|
||||||
menupres[i].ttmode = TTMODE_NONE;
|
menupres[i].ttmode = TTMODE_NONE;
|
||||||
menupres[i].ttscale = UINT8_MAX;
|
menupres[i].ttscale = UINT8_MAX;
|
||||||
menupres[i].ttcounterset = INT32_MAX;
|
|
||||||
menupres[i].ttname[0] = 0;
|
menupres[i].ttname[0] = 0;
|
||||||
menupres[i].ttx = INT16_MAX;
|
menupres[i].ttx = INT16_MAX;
|
||||||
menupres[i].tty = 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;
|
curhidepics = menupres[menutype].hidetitlepics;
|
||||||
curttmode = menupres[menutype].ttmode;
|
curttmode = menupres[menutype].ttmode;
|
||||||
curttscale = (menupres[menutype].ttscale != UINT8_MAX ? menupres[menutype].ttscale : ttscale);
|
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);
|
strncpy(curttname, menupres[menutype].ttname, 9);
|
||||||
curttx = (menupres[menutype].ttx != INT16_MAX ? menupres[menutype].ttx : ttx);
|
curttx = (menupres[menutype].ttx != INT16_MAX ? menupres[menutype].ttx : ttx);
|
||||||
curtty = (menupres[menutype].tty != INT16_MAX ? menupres[menutype].tty : tty);
|
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;
|
curhidepics = menupres[menutype].hidetitlepics;
|
||||||
curttmode = menupres[menutype].ttmode;
|
curttmode = menupres[menutype].ttmode;
|
||||||
curttscale = (menupres[menutype].ttscale != UINT8_MAX ? menupres[menutype].ttscale : ttscale);
|
curttscale = (menupres[menutype].ttscale != UINT8_MAX ? menupres[menutype].ttscale : ttscale);
|
||||||
curttcounterset = (menupres[menutype].ttcounterset != INT32_MAX ? menupres[menutype].ttcounterset : ttcounterset);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (!level)
|
else if (!level)
|
||||||
|
@ -2520,7 +2517,6 @@ static boolean MIT_SetCurTitlePics(UINT32 menutype, INT32 level, INT32 *retval,
|
||||||
curhidepics = hidetitlepics;
|
curhidepics = hidetitlepics;
|
||||||
curttmode = ttmode;
|
curttmode = ttmode;
|
||||||
curttscale = ttscale;
|
curttscale = ttscale;
|
||||||
curttcounterset = ttcounterset;
|
|
||||||
strncpy(curttname, ttname, 9);
|
strncpy(curttname, ttname, 9);
|
||||||
curttx = ttx;
|
curttx = ttx;
|
||||||
curtty = tty;
|
curtty = tty;
|
||||||
|
@ -2625,7 +2621,6 @@ static void M_HandleMenuPresState(menu_t *newMenu)
|
||||||
|
|
||||||
curttmode = ttmode;
|
curttmode = ttmode;
|
||||||
curttscale = ttscale;
|
curttscale = ttscale;
|
||||||
curttcounterset = ttcounterset;
|
|
||||||
strncpy(curttname, ttname, 9);
|
strncpy(curttname, ttname, 9);
|
||||||
curttx = ttx;
|
curttx = ttx;
|
||||||
curtty = tty;
|
curtty = tty;
|
||||||
|
|
|
@ -138,7 +138,6 @@ typedef struct
|
||||||
SINT8 hidetitlepics; // hide title gfx per menu; -1 means undefined, inherits global setting
|
SINT8 hidetitlepics; // hide title gfx per menu; -1 means undefined, inherits global setting
|
||||||
ttmode_enum ttmode; // title wing animation mode; default TTMODE_OLD
|
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
|
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)
|
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 ttx; // X position of title wing
|
||||||
INT16 tty; // Y position of title wing
|
INT16 tty; // Y position of title wing
|
||||||
|
|
Loading…
Reference in New Issue