Removed the "disable" linedef effect, since it's useless now that the character flags are gone
This commit is contained in:
parent
5b741d8232
commit
d3d24bc0bd
39
src/p_spec.c
39
src/p_spec.c
|
@ -99,7 +99,6 @@ typedef struct
|
||||||
thinker_t **thinkers;
|
thinker_t **thinkers;
|
||||||
} thinkerlist_t;
|
} thinkerlist_t;
|
||||||
|
|
||||||
static void P_SearchForDisableLinedefs(void);
|
|
||||||
static void P_SpawnScrollers(void);
|
static void P_SpawnScrollers(void);
|
||||||
static void P_SpawnFriction(void);
|
static void P_SpawnFriction(void);
|
||||||
static void P_SpawnPushers(void);
|
static void P_SpawnPushers(void);
|
||||||
|
@ -6421,8 +6420,6 @@ void P_SpawnSpecials(INT32 fromnetsave)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
P_SearchForDisableLinedefs(); // Disable linedefs are now allowed to disable *any* line
|
|
||||||
|
|
||||||
P_SpawnScrollers(); // Add generalized scrollers
|
P_SpawnScrollers(); // Add generalized scrollers
|
||||||
P_SpawnFriction(); // Friction model using linedefs
|
P_SpawnFriction(); // Friction model using linedefs
|
||||||
P_SpawnPushers(); // Pusher model using linedefs
|
P_SpawnPushers(); // Pusher model using linedefs
|
||||||
|
@ -6525,12 +6522,6 @@ void P_SpawnSpecials(INT32 fromnetsave)
|
||||||
P_AddCameraScanner(§ors[sec], §ors[s], R_PointToAngle2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y));
|
P_AddCameraScanner(§ors[sec], §ors[s], R_PointToAngle2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#ifdef PARANOIA
|
|
||||||
case 6: // Disable tags if level not cleared
|
|
||||||
I_Error("Failed to catch a disable linedef");
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
case 7: // Flat alignment - redone by toast
|
case 7: // Flat alignment - redone by toast
|
||||||
if ((lines[i].flags & (ML_NETONLY|ML_NONET)) != (ML_NETONLY|ML_NONET)) // If you can do something...
|
if ((lines[i].flags & (ML_NETONLY|ML_NONET)) != (ML_NETONLY|ML_NONET)) // If you can do something...
|
||||||
{
|
{
|
||||||
|
@ -9186,33 +9177,3 @@ static void P_SpawnPushers(void)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void P_SearchForDisableLinedefs(void)
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
INT32 j;
|
|
||||||
|
|
||||||
// Look for disable linedefs
|
|
||||||
for (i = 0; i < numlines; i++)
|
|
||||||
{
|
|
||||||
if (lines[i].special == 6)
|
|
||||||
{
|
|
||||||
// Remove special
|
|
||||||
// Do *not* remove tag. That would mess with the tag lists
|
|
||||||
// that P_InitTagLists literally just created!
|
|
||||||
lines[i].special = 0;
|
|
||||||
|
|
||||||
if (netgame || multiplayer)
|
|
||||||
{
|
|
||||||
if (lines[i].flags & ML_NONET)
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
else if (lines[i].flags & ML_NETONLY)
|
|
||||||
continue; // Net-only never triggers in single player
|
|
||||||
|
|
||||||
// Disable any linedef specials with our tag.
|
|
||||||
for (j = -1; (j = P_FindLineFromLineTag(&lines[i], j)) >= 0;)
|
|
||||||
lines[j].special = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue