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

- Make ACS SetTeleFog follow the same format as the DECORATE version too.

This commit is contained in:
MajorCooke 2014-12-18 09:29:23 -06:00
parent ba346616e5
commit 2747f9a9f3
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/p_acs.cpp
View File

@ -4760,10 +4760,15 @@ static void SetActorTeleFog(AActor *activator, int tid, FName telefogsrc, FName
if (activator != NULL) if (activator != NULL)
{ {
check = PClass::FindClass(telefogsrc); check = PClass::FindClass(telefogsrc);
if (check != NULL) if (check != NULL || !stricmp(telefogsrc, "none") || !stricmp(telefogsrc, "null"))
activator->TeleFogSourceType = NULL;
else
activator->TeleFogSourceType = check; activator->TeleFogSourceType = check;
check = PClass::FindClass(telefogdest); check = PClass::FindClass(telefogdest);
if (check != NULL) if (check != NULL || !stricmp(telefogdest, "none") || !stricmp(telefogdest, "null"))
activator->TeleFogDestType = NULL;
else
activator->TeleFogDestType = check; activator->TeleFogDestType = check;
} }
} }
@ -4775,10 +4780,15 @@ static void SetActorTeleFog(AActor *activator, int tid, FName telefogsrc, FName
while ((actor = iterator.Next())) while ((actor = iterator.Next()))
{ {
check = PClass::FindClass(telefogsrc); check = PClass::FindClass(telefogsrc);
if (check != NULL) if (check != NULL || !stricmp(telefogsrc, "none") || !stricmp(telefogsrc, "null"))
actor->TeleFogSourceType = NULL;
else
actor->TeleFogSourceType = check; actor->TeleFogSourceType = check;
check = PClass::FindClass(telefogdest); check = PClass::FindClass(telefogdest);
if (check != NULL) if (check != NULL || !stricmp(telefogdest, "none") || !stricmp(telefogdest, "null"))
actor->TeleFogDestType = NULL;
else
actor->TeleFogDestType = check; actor->TeleFogDestType = check;
} }
} }