Merge branch 'disablespeedadjust-fix' into 'next'

Disablespeedadjust fix

See merge request STJr/SRB2!425
This commit is contained in:
Digiku 2018-12-24 16:31:19 -05:00
commit be9a04e489

View file

@ -2952,7 +2952,7 @@ static void readmaincfg(MYFILE *f)
else if (fastcmp(word, "USENIGHTSSS")) else if (fastcmp(word, "USENIGHTSSS"))
{ {
DEH_WriteUndoline(word, va("%d", useNightsSS), UNDO_NONE); DEH_WriteUndoline(word, va("%d", useNightsSS), UNDO_NONE);
useNightsSS = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y'); useNightsSS = (value || word2[0] == 'T' || word2[0] == 'Y');
} }
else if (fastcmp(word, "REDTEAM")) else if (fastcmp(word, "REDTEAM"))
{ {
@ -3026,7 +3026,7 @@ static void readmaincfg(MYFILE *f)
else if (fastcmp(word, "LOOPTITLE")) else if (fastcmp(word, "LOOPTITLE"))
{ {
DEH_WriteUndoline(word, va("%d", looptitle), UNDO_NONE); DEH_WriteUndoline(word, va("%d", looptitle), UNDO_NONE);
looptitle = (boolean)(value || word2[0] == 'T' || word2[0] == 'Y'); looptitle = (value || word2[0] == 'T' || word2[0] == 'Y');
} }
else if (fastcmp(word, "TITLESCROLLSPEED")) else if (fastcmp(word, "TITLESCROLLSPEED"))
{ {
@ -3044,7 +3044,7 @@ static void readmaincfg(MYFILE *f)
else if (fastcmp(word, "DISABLESPEEDADJUST")) else if (fastcmp(word, "DISABLESPEEDADJUST"))
{ {
DEH_WriteUndoline(word, va("%d", disableSpeedAdjust), UNDO_NONE); DEH_WriteUndoline(word, va("%d", disableSpeedAdjust), UNDO_NONE);
disableSpeedAdjust = (UINT8)get_number(word2); disableSpeedAdjust = (value || word2[0] == 'T' || word2[0] == 'Y');
} }
else if (fastcmp(word, "NUMDEMOS")) else if (fastcmp(word, "NUMDEMOS"))
{ {