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 'coop-item-respawn' into 'master'

Browse source 
Allow item respawn in co-op again

See merge request STJr/SRB2Internal!466
This commit is contained in:
MascaraSnake 2019-11-14 18:06:32 -05:00
commit 0c304eefce
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/d_netcmd.c
View file

@ -3907,13 +3907,17 @@ void D_GameTypeChanged(INT32 lastgametype)
// There will always be a server, and this only needs to be done once. // There will always be a server, and this only needs to be done once.
if (server && (multiplayer || netgame)) if (server && (multiplayer || netgame))
{ {
if (gametype == GT_COMPETITION || gametype == GT_COOP) if (gametype == GT_COMPETITION)
CV_SetValue(&cv_itemrespawn, 0); CV_SetValue(&cv_itemrespawn, 0);
else if (!cv_itemrespawn.changed) else if (!cv_itemrespawn.changed || lastgametype == GT_COMPETITION)
CV_SetValue(&cv_itemrespawn, 1); CV_SetValue(&cv_itemrespawn, 1);
switch (gametype) switch (gametype)
{ {
case GT_COOP:
if (!cv_itemrespawntime.changed)
CV_Set(&cv_itemrespawntime, cv_itemrespawntime.defaultvalue); // respawn normally
break;
case GT_MATCH: case GT_MATCH:
case GT_TEAMMATCH: case GT_TEAMMATCH:
if (!cv_timelimit.changed && !cv_pointlimit.changed) // user hasn't changed limits if (!cv_timelimit.changed && !cv_pointlimit.changed) // user hasn't changed limits

2
src/p_inter.c
View file

@ -2404,7 +2404,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
{ {
P_SetTarget(&target->target, source); P_SetTarget(&target->target, source);
source->player->numboxes++; source->player->numboxes++;
if ((cv_itemrespawn.value && gametype != GT_COOP && (modifiedgame || netgame || multiplayer))) if (cv_itemrespawn.value && gametype != GT_COOP && (modifiedgame || netgame || multiplayer))
target->fuse = cv_itemrespawntime.value*TICRATE + 2; // Random box generation target->fuse = cv_itemrespawntime.value*TICRATE + 2; // Random box generation
} }

2
src/p_mobj.c
View file

@ -11011,7 +11011,7 @@ void P_RespawnSpecials(void)
// only respawn items when cv_itemrespawn is on // only respawn items when cv_itemrespawn is on
if (!(netgame || multiplayer) // Never respawn in single player if (!(netgame || multiplayer) // Never respawn in single player
|| gametype == GT_COOP // Never respawn in co-op gametype || (maptol & TOL_NIGHTS) // Never respawn in NiGHTs
|| !cv_itemrespawn.value) // cvar is turned off || !cv_itemrespawn.value) // cvar is turned off
return; return;

5
src/p_setup.c
View file

@ -2223,7 +2223,10 @@ static void P_LevelInitStuff(void)
tokenbits = 0; tokenbits = 0;
runemeraldmanager = false; runemeraldmanager = false;
emeraldspawndelay = 60*TICRATE; emeraldspawndelay = 60*TICRATE;
nummaprings = mapheaderinfo[gamemap-1]->startrings; if ((netgame || multiplayer) && !G_IsSpecialStage(gamemap))
nummaprings = -1;
else
nummaprings = mapheaderinfo[gamemap-1]->startrings;
// emerald hunt // emerald hunt
hunt1 = hunt2 = hunt3 = NULL; hunt1 = hunt2 = hunt3 = NULL;