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

Merge branch 'fix-line-80' into 'master'

Browse source 
Fix line 80

Closes #181

See merge request KartKrew/Kart!616
This commit is contained in:
Sal 2022-06-08 13:07:08 +00:00
commit 892211bcae
3 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_setup.c
View file

@ -4369,8 +4369,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
P_SpawnSlopes(fromnetsave); P_SpawnSlopes(fromnetsave);
P_SpawnSpecialsAfterSlopes();
P_SpawnMapThings(!fromnetsave); P_SpawnMapThings(!fromnetsave);
for (numcoopstarts = 0; numcoopstarts < MAXPLAYERS; numcoopstarts++) for (numcoopstarts = 0; numcoopstarts < MAXPLAYERS; numcoopstarts++)

31
src/p_spec.c
View file

@ -6955,6 +6955,12 @@ void P_SpawnSpecialsThatRequireObjects(boolean fromnetsave)
for (i = 0; i < numlines; i++) for (i = 0; i < numlines; i++)
{ {
if (P_IsLineDisabled(&lines[i]))
{
/* remove the special so it can't even be found during the level */
lines[i].special = 0;
}
switch (lines[i].special) switch (lines[i].special)
{ {
case 30: // Polyobj_Flag case 30: // Polyobj_Flag
@ -6968,29 +6974,7 @@ void P_SpawnSpecialsThatRequireObjects(boolean fromnetsave)
case 32: // Polyobj_RotDisplace case 32: // Polyobj_RotDisplace
PolyRotDisplace(&lines[i]); PolyRotDisplace(&lines[i]);
break; break;
}
}
if (!fromnetsave)
P_RunLevelLoadExecutors();
}
/** Fuck ML_NONET
*/
void P_SpawnSpecialsAfterSlopes(void)
{
size_t i;
for (i = 0; i < numlines; ++i)
{
if (P_IsLineDisabled(&lines[i]))
{
/* remove the special so it can't even be found during the level */
lines[i].special = 0;
}
switch (lines[i].special)
{
case 80: // Raise tagged things by type to this FOF case 80: // Raise tagged things by type to this FOF
{ {
mtag_t tag = Tag_FGet(&lines[i].tags); mtag_t tag = Tag_FGet(&lines[i].tags);
@ -7003,6 +6987,9 @@ void P_SpawnSpecialsAfterSlopes(void)
break; break;
} }
} }
if (!fromnetsave)
P_RunLevelLoadExecutors();
} }
/** Adds 3Dfloors as appropriate based on a common control linedef. /** Adds 3Dfloors as appropriate based on a common control linedef.

1
src/p_spec.h
View file

@ -42,7 +42,6 @@ void P_SetupLevelFlatAnims(void);
// at map load // at map load
void P_InitSpecials(void); void P_InitSpecials(void);
void P_SpawnSpecials(boolean fromnetsave); void P_SpawnSpecials(boolean fromnetsave);
void P_SpawnSpecialsAfterSlopes(void);
void P_SpawnSpecialsThatRequireObjects(boolean fromnetsave); void P_SpawnSpecialsThatRequireObjects(boolean fromnetsave);
// every tic // every tic