From fc02b735348c6b18b190f96a09baafd34c8adaf4 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sat, 2 Nov 2019 12:40:12 -0400
Subject: [PATCH] Remove TTCOUNTERSET to simplify custom title SOC
---
src/dehacked.c | 10 ----------
src/f_finale.c | 3 ---
src/f_finale.h | 2 --
src/m_menu.c | 5 -----
src/m_menu.h | 1 -
5 files changed, 21 deletions(-)
diff --git a/src/dehacked.c b/src/dehacked.c
index df22952164..37df6176c5 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -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);
diff --git a/src/f_finale.c b/src/f_finale.c
index 9c0ea13f07..a6da783250 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -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;
diff --git a/src/f_finale.h b/src/f_finale.h
index b27d49baa9..ca1de92256 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -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;
diff --git a/src/m_menu.c b/src/m_menu.c
index 17461c5ff6..ede83fd92e 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -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;
diff --git a/src/m_menu.h b/src/m_menu.h
index 8ee944f6d7..6f27d64323 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -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
--
GitLab