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

Make MENU dehacked block top-level; TITLESCREEN is not necessary

This commit is contained in:
mazmazz 2018-11-16 12:12:11 -05:00
parent 15c0bab0c9
commit 199bc155bc
1 changed files with 16 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
src/dehacked.c
View File

@ -1944,31 +1944,8 @@ static void readmenu(MYFILE *f, INT32 num)
tmp = strchr(s, '=');
if (tmp)
*(tmp-1) = '\0';
else if (!strncmp(word, "MENU", 4))
{
// HACK: readtitlescreen fails to read the next menu because it skips this line
// which already has the next menu's type
// so just loop ourselves here
tmp = strchr(s, ' ');
if (tmp)
{
word2 = (tmp += 1);
strupr(word2);
num = get_number(word2);
if (num >= 0 && num < NUMMENUTYPES)
continue;
else
{
// zero-based, but start at 1
deh_warning("Menu number %d out of range (1 - %d)", num, NUMMENUTYPES-1);
break;
}
}
else
break;
continue;
}
else
break;
strupr(word);
// Now get the part after
@ -1977,7 +1954,7 @@ static void readmenu(MYFILE *f, INT32 num)
value = atoi(word2); // used for numerical settings
//CONS_Printf("Menu %d> %s | %s\n", num, word, word2);
CONS_Printf("Menu %d> %s | %s\n", num, word, word2);
if (fastcmp(word, "BACKGROUNDNAME"))
{
@ -2021,123 +1998,6 @@ static void readmenu(MYFILE *f, INT32 num)
Z_Free(s);
}
static void readtitlescreen(MYFILE *f)
{
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
char *word = s;
char *word2;
char *tmp;
INT32 value;
do
{
if (myfgets(s, MAXLINELEN, f))
{
if (s[0] == '\n')
break;
// First remove trailing newline, if there is one
tmp = strchr(s, '\n');
if (tmp)
*tmp = '\0';
tmp = strchr(s, '#');
if (tmp)
*tmp = '\0';
if (s == tmp)
continue; // Skip comment lines, but don't break.
// Get the part before the " = "
tmp = strchr(s, '=');
if (tmp)
*(tmp-1) = '\0';
else
{
tmp = strchr(s, ' ');
if (tmp)
*(tmp) = '\0';
else
break;
}
strupr(word);
// Now get the part after
word2 = (*tmp == '=') ? (tmp += 2) : (tmp += 1);
strupr(word2);
value = atoi(word2); // used for numerical settings
//CONS_Printf("Title> %s | %s\n", word, word2);
// NOTE: If you change these TITLE or DEMO parameters,
// also change them in `readmaincfg`
if (fastcmp(word, "LOOPTITLE"))
{
looptitle = (boolean)(value || word2[0] == 'T' || word2[0] == 'Y');
titlechanged = true;
}
else if (fastcmp(word, "TITLEMAP"))
{
// Support using the actual map name,
// i.e., Level AB, Level FZ, etc.
// Convert to map number
if (word2[0] >= 'A' && word2[0] <= 'Z')
value = M_MapNumber(word2[0], word2[1]);
else
value = get_number(word2);
titlemap = (INT16)value;
titlechanged = true;
}
// HIDETITLEPICS and TITLESCROLLSPEED are also in `readmenu`, per menu
if (fastcmp(word, "HIDETITLEPICS"))
{
hidetitlepics = (boolean)(value || word2[0] == 'T' || word2[0] == 'Y');
titlechanged = true;
}
else if (fastcmp(word, "TITLESCROLLSPEED") || fastcmp(word, "TITLESCROLLXSPEED"))
{
titlescrollspeed = get_number(word2);
titlechanged = true;
}
else if (fastcmp(word, "NUMDEMOS"))
{
numDemos = (UINT8)get_number(word2);
titlechanged = true;
}
else if (fastcmp(word, "DEMODELAYTIME"))
{
demoDelayTime = get_number(word2);
titlechanged = true;
}
else if (fastcmp(word, "DEMOIDLETIME"))
{
demoIdleTime = get_number(word2);
titlechanged = true;
}
else if (fastcmp(word, "MENU"))
{
value = get_number(word2);
if (value >= 0 && value < NUMMENUTYPES)
readmenu(f, value);
else
// zero-based, but start at 1
deh_warning("Menu number %d out of range (1 - %d)", value, NUMMENUTYPES-1);
// HACK: Menu line seeking is broken; it feeds us the next line
// AFTER the menu block ends
// So in the next loop here, we're SKIPPING this next line
// We loop through MENU blocks in readmenu already,
// so just end iterating here.
break;
}
}
} while (!myfeof(f)); // finish when the line is empty
Z_Free(s);
}
static void readhuditem(MYFILE *f, INT32 num)
{
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
@ -3361,8 +3221,6 @@ static void readmaincfg(MYFILE *f)
introtoplay = 128;
introchanged = true;
}
// NOTE: If you change these TITLE or DEMO parameters,
// also change them in `readtitlescreen`
else if (fastcmp(word, "LOOPTITLE"))
{
looptitle = (boolean)(value || word2[0] == 'T' || word2[0] == 'Y');
@ -3736,11 +3594,6 @@ static void DEH_LoadDehackedFile(MYFILE *f)
readmaincfg(f);
continue;
}
else if (fastcmp(word, "TITLESCREEN"))
{
readtitlescreen(f);
continue;
}
else if (fastcmp(word, "WIPES"))
{
readwipes(f);
@ -3894,6 +3747,19 @@ static void DEH_LoadDehackedFile(MYFILE *f)
ignorelines(f);
}
}
else if (fastcmp(word, "MENU"))
{
if (i == 0 && word2[0] != '0') // If word2 isn't a number
i = get_menutype(word2); // find a huditem by name
if (i >= 1 && i < NUMMENUTYPES)
readmenu(f, i);
else
{
// zero-based, but let's start at 1
deh_warning("Menu number %d out of range (1 - %d)", i, NUMMENUTYPES-1);
ignorelines(f);
}
}
else if (fastcmp(word, "EMBLEM"))
{
if (!gamedataadded)