thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set eventmode when testing Special Stages from ZB

Browse source
This commit is contained in:
Sally Coolatta 2022-11-22 22:46:45 -05:00
parent e7ae65f30e
commit 577f505342
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/d_main.c
View file

@ -1863,6 +1863,18 @@ void D_SRB2Main(void)
G_SetUsedCheats(); G_SetUsedCheats();
} }
if (grandprixinfo.gp == true && mapheaderinfo[pstartmap-1])
{
if (mapheaderinfo[pstartmap-1]->typeoflevel & TOL_SPECIAL)
{
specialStage.active = true;
specialStage.encore = grandprixinfo.encore;
grandprixinfo.eventmode = GPEVENT_SPECIAL;
}
G_SetUsedCheats();
}
D_MapChange(pstartmap, gametype, (cv_kartencore.value == 1), true, 0, false, false); D_MapChange(pstartmap, gametype, (cv_kartencore.value == 1), true, 0, false, false);
} }
} }

8
src/p_mobj.c
View file

@ -46,6 +46,7 @@
#include "k_terrain.h" #include "k_terrain.h"
#include "k_collide.h" #include "k_collide.h"
#include "k_objects.h" #include "k_objects.h"
#include "k_grandprix.h"
static CV_PossibleValue_t CV_BobSpeed[] = {{0, "MIN"}, {4*FRACUNIT, "MAX"}, {0, NULL}}; static CV_PossibleValue_t CV_BobSpeed[] = {{0, "MIN"}, {4*FRACUNIT, "MAX"}, {0, NULL}};
consvar_t cv_movebob = CVAR_INIT ("movebob", "1.0", CV_FLOAT|CV_SAVE, CV_BobSpeed, NULL); consvar_t cv_movebob = CVAR_INIT ("movebob", "1.0", CV_FLOAT|CV_SAVE, CV_BobSpeed, NULL);
@ -11468,13 +11469,12 @@ void P_SpawnPlayer(INT32 playernum)
} }
else if (p->bot) else if (p->bot)
{ {
/* if (grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE)
if (bonusgame || specialstage || boss)
{ {
// Bots should avoid // Bots aren't supposed to be here.
p->spectator = true; p->spectator = true;
} }
*/ else
{ {
// No point in a spectating bot! // No point in a spectating bot!
p->spectator = false; p->spectator = false;