From 278fd8745243fa2257a72db859d3b768ea928547 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Sat, 7 Jul 2018 17:33:26 -0400 Subject: [PATCH] Fix Sryder's bool error I don't seem to get this error for some reason, even after upgrading to w64 & GCC 7.2.0, but hopefully this fixes it --- src/d_netcmd.c | 8 ++++---- src/p_setup.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 432ddea5..f3aa3d8a 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -5209,24 +5209,24 @@ static void Command_ShowTime_f(void) // SRB2Kart: On change messages static void KartFrantic_OnChange(void) { - if (cv_kartfrantic.value != franticitems && gamestate == GS_LEVEL) + if ((boolean)cv_kartfrantic.value != franticitems && gamestate == GS_LEVEL) CONS_Printf(M_GetText("Frantic items will be turned %s next round.\n"), cv_kartfrantic.value ? M_GetText("on") : M_GetText("off")); } static void KartSpeed_OnChange(void) { - if (cv_kartspeed.value != gamespeed && G_RaceGametype() && gamestate == GS_LEVEL) + if ((UINT8)cv_kartspeed.value != gamespeed && G_RaceGametype() && gamestate == GS_LEVEL) CONS_Printf(M_GetText("Game speed will be changed to \"%s\" next round.\n"), cv_kartspeed.string); } static void KartMirror_OnChange(void) { - if (cv_kartmirror.value != mirrormode && G_RaceGametype() && gamestate == GS_LEVEL) + if ((boolean)cv_kartmirror.value != mirrormode && G_RaceGametype() && gamestate == GS_LEVEL) CONS_Printf(M_GetText("Mirror Mode will be turned %s next round.\n"), cv_kartmirror.value ? M_GetText("on") : M_GetText("off")); } static void KartComeback_OnChange(void) { - if (cv_kartcomeback.value != comeback && G_BattleGametype() && gamestate == GS_LEVEL) + if ((boolean)cv_kartcomeback.value != comeback && G_BattleGametype() && gamestate == GS_LEVEL) CONS_Printf(M_GetText("Karma Comeback will be turned %s next round.\n"), cv_kartcomeback.value ? M_GetText("on") : M_GetText("off")); } \ No newline at end of file diff --git a/src/p_setup.c b/src/p_setup.c index bc29cc6c..7e051bb2 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2992,15 +2992,15 @@ boolean P_SetupLevel(boolean skipprecip) if (G_BattleGametype()) gamespeed = 0; else - gamespeed = cv_kartspeed.value; + gamespeed = (UINT8)cv_kartspeed.value; if (G_BattleGametype()) mirrormode = false; else - mirrormode = cv_kartmirror.value; + mirrormode = (boolean)cv_kartmirror.value; - franticitems = cv_kartfrantic.value; - comeback = cv_kartcomeback.value; + franticitems = (boolean)cv_kartfrantic.value; + comeback = (boolean)cv_kartcomeback.value; } lightningcooldown = 0;