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

Merge branch 'vote-gametype-change' into 'master'

Browse source 
Fix timelimit not getting set when going to Battle

See merge request KartKrew/Kart!496
This commit is contained in:
Sal 2021-12-16 16:16:26 +00:00
commit 24a5f20fc7
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_demo.c
View file

@ -2793,6 +2793,7 @@ void G_DoPlayDemo(char *defdemoname)
demoflags = READUINT8(demo_p); demoflags = READUINT8(demo_p);
gametype = READUINT8(demo_p); gametype = READUINT8(demo_p);
G_SetGametype(gametype);
if (demo.title) // Titledemos should always play and ought to always be compatible with whatever wadlist is running. if (demo.title) // Titledemos should always play and ought to always be compatible with whatever wadlist is running.
G_SkipDemoExtraFiles(&demo_p); G_SkipDemoExtraFiles(&demo_p);

2
src/y_inter.c
View file

@ -1459,7 +1459,7 @@ static void Y_VoteStops(SINT8 pick, SINT8 level)
if (gametype != votelevels[level][1]) if (gametype != votelevels[level][1])
{ {
INT16 lastgametype = gametype; INT16 lastgametype = gametype;
gametype = votelevels[level][1]; G_SetGametype(votelevels[level][1]);
D_GameTypeChanged(lastgametype); D_GameTypeChanged(lastgametype);
forceresetplayers = true; forceresetplayers = true;
} }