zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed: ACS version of SetTeleFog and SwapTeleFog targeted the caller despite TID.

This commit is contained in:
MajorCooke 2014-12-18 09:24:35 -06:00
parent dcab57b236
commit ba346616e5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/p_acs.cpp
View File

@ -4776,10 +4776,10 @@ static void SetActorTeleFog(AActor *activator, int tid, FName telefogsrc, FName
{ {
check = PClass::FindClass(telefogsrc); check = PClass::FindClass(telefogsrc);
if (check != NULL) if (check != NULL)
activator->TeleFogSourceType = check; actor->TeleFogSourceType = check;
check = PClass::FindClass(telefogdest); check = PClass::FindClass(telefogdest);
if (check != NULL) if (check != NULL)
activator->TeleFogDestType = check; actor->TeleFogDestType = check;
} }
} }
} }
@ -4806,11 +4806,11 @@ static int SwapActorTeleFog(AActor *activator, int tid)
while ((actor = iterator.Next())) while ((actor = iterator.Next()))
{ {
if (activator->TeleFogSourceType == activator->TeleFogDestType) if (actor->TeleFogSourceType == actor->TeleFogDestType)
continue; //They're the same. Save the effort. continue; //They're the same. Save the effort.
const PClass *temp = activator->TeleFogSourceType; const PClass *temp = actor->TeleFogSourceType;
activator->TeleFogSourceType = activator->TeleFogDestType; actor->TeleFogSourceType = actor->TeleFogDestType;
activator->TeleFogDestType = temp; actor->TeleFogDestType = temp;
count++; count++;
} }
} }