From ba346616e56c4e1df84f7cdceddf66f03114dca3 Mon Sep 17 00:00:00 2001 From: MajorCooke Date: Thu, 18 Dec 2014 09:24:35 -0600 Subject: [PATCH] - Fixed: ACS version of SetTeleFog and SwapTeleFog targeted the caller despite TID. --- src/p_acs.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 54a7110a1..a86212679 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -4776,10 +4776,10 @@ static void SetActorTeleFog(AActor *activator, int tid, FName telefogsrc, FName { check = PClass::FindClass(telefogsrc); if (check != NULL) - activator->TeleFogSourceType = check; + actor->TeleFogSourceType = check; check = PClass::FindClass(telefogdest); if (check != NULL) - activator->TeleFogDestType = check; + actor->TeleFogDestType = check; } } } @@ -4806,11 +4806,11 @@ static int SwapActorTeleFog(AActor *activator, int tid) while ((actor = iterator.Next())) { - if (activator->TeleFogSourceType == activator->TeleFogDestType) + if (actor->TeleFogSourceType == actor->TeleFogDestType) continue; //They're the same. Save the effort. - const PClass *temp = activator->TeleFogSourceType; - activator->TeleFogSourceType = activator->TeleFogDestType; - activator->TeleFogDestType = temp; + const PClass *temp = actor->TeleFogSourceType; + actor->TeleFogSourceType = actor->TeleFogDestType; + actor->TeleFogDestType = temp; count++; } }