From dd3d7789d549e1457b15b972cd5f0fbcd133e71d Mon Sep 17 00:00:00 2001 From: MajorCooke Date: Wed, 17 Dec 2014 17:16:56 -0600 Subject: [PATCH] - Always allow replacement. --- src/p_spec.h | 2 +- src/p_teleport.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/p_spec.h b/src/p_spec.h index 4af527ca8e..a225d2379f 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -903,7 +903,7 @@ bool EV_DoChange (line_t *line, EChange changetype, int tag); // // P_TELEPT // -void P_SpawnTeleportFog(AActor *mobj, fixed_t x, fixed_t y, fixed_t z, bool beforeTele = true, bool replace = true, bool setTarget = false); //Spawns teleport fog. Pass the actor to pluck TeleFogFromType and TeleFogToType. 'from' determines if this is the fog to spawn at the old position (true) or new (false). +void P_SpawnTeleportFog(AActor *mobj, fixed_t x, fixed_t y, fixed_t z, bool beforeTele = true, bool setTarget = false); //Spawns teleport fog. Pass the actor to pluck TeleFogFromType and TeleFogToType. 'from' determines if this is the fog to spawn at the old position (true) or new (false). bool P_Teleport (AActor *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle, bool useFog, bool sourceFog, bool keepOrientation, bool haltVelocity = true, bool keepHeight = false); bool EV_Teleport (int tid, int tag, line_t *line, int side, AActor *thing, bool fog, bool sourceFog, bool keepOrientation, bool haltVelocity = true, bool keepHeight = false); bool EV_SilentLineTeleport (line_t *line, int side, AActor *thing, int id, INTBOOL reverse); diff --git a/src/p_teleport.cpp b/src/p_teleport.cpp index d86a87672f..df103f37f6 100644 --- a/src/p_teleport.cpp +++ b/src/p_teleport.cpp @@ -74,18 +74,18 @@ void ATeleportFog::PostBeginPlay () // //========================================================================== -void P_SpawnTeleportFog(AActor *mobj, fixed_t x, fixed_t y, fixed_t z, bool beforeTele, bool replace, bool setTarget) +void P_SpawnTeleportFog(AActor *mobj, fixed_t x, fixed_t y, fixed_t z, bool beforeTele, bool setTarget) { AActor *mo; FNameNoInit tf = (beforeTele ? mobj->TeleFogSourceType : mobj->TeleFogDestType); if (!tf) //If the actor doesn't have one, initialize the original. { - mo = Spawn(x, y, z, (replace ? ALLOW_REPLACE : NO_REPLACE)); + mo = Spawn(x, y, z, ALLOW_REPLACE); } else { - mo = Spawn(tf, x, y, z, (replace ? ALLOW_REPLACE : NO_REPLACE)); + mo = Spawn(tf, x, y, z, ALLOW_REPLACE); } if (mo != NULL && setTarget)