thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a few messups due to the merged cvars

Browse source
This commit is contained in:
TehRealSalt 2019-10-03 11:22:58 -04:00
parent 4e0a8ef9d8
commit d10e4aebac
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

@ -1559,7 +1559,7 @@ void D_SRB2Main(void)
else if (!dedicated && M_MapLocked(pstartmap)) else if (!dedicated && M_MapLocked(pstartmap))
I_Error("You need to unlock this level before you can warp to it!\n"); I_Error("You need to unlock this level before you can warp to it!\n");
else else
D_MapChange(pstartmap, gametype, (boolean)cv_kartencore.value, true, 0, false, false); D_MapChange(pstartmap, gametype, (cv_kartencore.value == 1), true, 0, false, false);
} }
} }
else if (M_CheckParm("-skipintro")) else if (M_CheckParm("-skipintro"))

10
src/d_netcmd.c
View file

@ -2395,7 +2395,7 @@ void D_SetupVote(void)
UINT8 secondgt = G_SometimesGetDifferentGametype(); UINT8 secondgt = G_SometimesGetDifferentGametype();
INT16 votebuffer[3] = {-1,-1,-1}; INT16 votebuffer[3] = {-1,-1,-1};
if (cv_kartencore.value && G_RaceGametype()) if ((cv_kartencore.value == 1) && G_RaceGametype())
WRITEUINT8(p, (gametype|0x80)); WRITEUINT8(p, (gametype|0x80));
else else
WRITEUINT8(p, gametype); WRITEUINT8(p, gametype);
@ -2566,7 +2566,7 @@ static void Command_Map_f(void)
// new encoremode value // new encoremode value
// use cvar by default // use cvar by default
newencoremode = (boolean)cv_kartencore.value; newencoremode = (cv_kartencore.value == 1);
if (COM_CheckParm("-encore")) if (COM_CheckParm("-encore"))
{ {
@ -5802,10 +5802,10 @@ static void KartEncore_OnChange(void)
{ {
if (G_RaceGametype()) if (G_RaceGametype())
{ {
if ((boolean)cv_kartencore.value != encoremode && gamestate == GS_LEVEL /*&& leveltime > starttime*/) if ((cv_kartencore.value == 1) != encoremode && gamestate == GS_LEVEL /*&& leveltime > starttime*/)
CONS_Printf(M_GetText("Encore Mode will be turned %s next round.\n"), cv_kartencore.value ? M_GetText("on") : M_GetText("off")); CONS_Printf(M_GetText("Encore Mode will be set to %s next round.\n"), cv_kartencore.string);
else else
CONS_Printf(M_GetText("Encore Mode has been turned %s.\n"), cv_kartencore.value ? M_GetText("on") : M_GetText("off")); CONS_Printf(M_GetText("Encore Mode has been set to %s.\n"), cv_kartencore.string);
} }
} }

6
src/g_game.c
View file

@ -2340,7 +2340,7 @@ void G_Ticker(boolean run)
G_DoReborn(consoleplayer);*/ G_DoReborn(consoleplayer);*/
D_MapChange(gamemap, gametype, cv_kartencore.value, true, 1, false, false); D_MapChange(gamemap, gametype, (cv_kartencore.value == 1), true, 1, false, false);
} }
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
@ -3426,7 +3426,7 @@ INT16 G_SometimesGetDifferentGametype(void)
break; break;
} }
} }
if (encorepossible != (boolean)cv_kartencore.value) if (encorepossible != (cv_kartencore.value == 1))
return (gametype|0x80); return (gametype|0x80);
} }
return gametype; return gametype;
@ -3903,7 +3903,7 @@ void G_NextLevel(void)
} }
forceresetplayers = false; forceresetplayers = false;
deferencoremode = (boolean)cv_kartencore.value; deferencoremode = (cv_kartencore.value == 1);
} }
gameaction = ga_worlddone; gameaction = ga_worlddone;

2
src/hu_stuff.c
View file

@ -3017,7 +3017,7 @@ static void HU_DrawRankings(void)
} }
V_DrawCenteredString(256, 8, 0, "GAME SPEED"); V_DrawCenteredString(256, 8, 0, "GAME SPEED");
V_DrawCenteredString(256, 16, hilicol, cv_kartspeed.string); V_DrawCenteredString(256, 16, hilicol, kartspeed_cons_t[gamespeed].string);
} }
// When you play, you quickly see your score because your name is displayed in white. // When you play, you quickly see your score because your name is displayed in white.

6
src/m_menu.c
View file

@ -8644,11 +8644,11 @@ static void M_StartServer(INT32 choice)
paused = false; paused = false;
SV_StartSinglePlayerServer(); SV_StartSinglePlayerServer();
multiplayer = true; // yeah, SV_StartSinglePlayerServer clobbers this... multiplayer = true; // yeah, SV_StartSinglePlayerServer clobbers this...
D_MapChange(cv_nextmap.value, cv_newgametype.value, (boolean)cv_kartencore.value, 1, 1, false, false); D_MapChange(cv_nextmap.value, cv_newgametype.value, (cv_kartencore.value == 1), 1, 1, false, false);
} }
else else
{ {
D_MapChange(cv_nextmap.value, cv_newgametype.value, (boolean)cv_kartencore.value, 1, 1, false, false); D_MapChange(cv_nextmap.value, cv_newgametype.value, (cv_kartencore.value == 1), 1, 1, false, false);
COM_BufAddText("dummyconsvar 1\n"); COM_BufAddText("dummyconsvar 1\n");
} }
@ -8685,7 +8685,7 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
V_DrawFill(x-1, y-1, w+2, i+2, trans); // variable reuse... V_DrawFill(x-1, y-1, w+2, i+2, trans); // variable reuse...
if (!cv_kartencore.value || gamestate == GS_TIMEATTACK || cv_newgametype.value != GT_RACE) if ((cv_kartencore.value != 1) || gamestate == GS_TIMEATTACK || cv_newgametype.value != GT_RACE)
V_DrawSmallScaledPatch(x, y, 0, PictureOfLevel); V_DrawSmallScaledPatch(x, y, 0, PictureOfLevel);
else else
{ {