From 936b9ecebcdad7e34f5c0ce0b5af53d37637bf20 Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Mon, 24 Dec 2018 19:29:54 +0000 Subject: [PATCH 1/2] Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean --- src/dehacked.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dehacked.c b/src/dehacked.c index cd9156766..837ea810c 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -3044,7 +3044,7 @@ static void readmaincfg(MYFILE *f) else if (fastcmp(word, "DISABLESPEEDADJUST")) { 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")) { From 31c6b6ef77f7ba76ecdfd40f826a5f368a632986 Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Mon, 24 Dec 2018 19:37:52 +0000 Subject: [PATCH 2/2] remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway --- src/dehacked.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 837ea810c..60379df07 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -2952,7 +2952,7 @@ static void readmaincfg(MYFILE *f) else if (fastcmp(word, "USENIGHTSSS")) { 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")) { @@ -3026,7 +3026,7 @@ static void readmaincfg(MYFILE *f) else if (fastcmp(word, "LOOPTITLE")) { 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")) {