Merge branch 'tol-moment' into 'next'
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags See merge request STJr/SRB2!825
This commit is contained in:
commit
76bda716cd
|
@ -1249,7 +1249,7 @@ static void readgametype(MYFILE *f, char *gtname)
|
||||||
newgttol = (UINT32)i;
|
newgttol = (UINT32)i;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
UINT16 tol = 0;
|
UINT32 tol = 0;
|
||||||
tmp = strtok(word2,",");
|
tmp = strtok(word2,",");
|
||||||
do {
|
do {
|
||||||
for (i = 0; TYPEOFLEVEL[i].name; i++)
|
for (i = 0; TYPEOFLEVEL[i].name; i++)
|
||||||
|
@ -1591,7 +1591,7 @@ static void readlevelheader(MYFILE *f, INT32 num)
|
||||||
mapheaderinfo[num-1]->typeoflevel = (UINT32)i;
|
mapheaderinfo[num-1]->typeoflevel = (UINT32)i;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
UINT16 tol = 0;
|
UINT32 tol = 0;
|
||||||
tmp = strtok(word2,",");
|
tmp = strtok(word2,",");
|
||||||
do {
|
do {
|
||||||
for (i = 0; TYPEOFLEVEL[i].name; i++)
|
for (i = 0; TYPEOFLEVEL[i].name; i++)
|
||||||
|
@ -7477,7 +7477,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
||||||
|
|
||||||
// Got Flag Sign
|
// Got Flag Sign
|
||||||
"S_GOTFLAG",
|
"S_GOTFLAG",
|
||||||
|
|
||||||
// Finish flag
|
// Finish flag
|
||||||
"S_FINISHFLAG",
|
"S_FINISHFLAG",
|
||||||
|
|
||||||
|
@ -10236,7 +10236,7 @@ static fixed_t find_const(const char **rword)
|
||||||
free(word);
|
free(word);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
else if (fastncmp("GT_",word,4)) {
|
else if (fastncmp("GT_",word,3)) {
|
||||||
r = get_gametype(word);
|
r = get_gametype(word);
|
||||||
free(word);
|
free(word);
|
||||||
return r;
|
return r;
|
||||||
|
|
Loading…
Reference in a new issue