From f087903fca9b6fab526746bf535d3966e7bd806b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 28 Apr 2015 22:11:43 +0200 Subject: [PATCH] - remove some redundancy from TeleportFog code. --- src/p_acs.cpp | 4 ++-- src/thingdef/thingdef_properties.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/p_acs.cpp b/src/p_acs.cpp index e26cf8994..519e71c00 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -4755,8 +4755,8 @@ static void SetActorTeleFog(AActor *activator, int tid, FString telefogsrc, FStr FActorIterator iterator(tid); AActor *actor; - const PClass * const src = telefogsrc.IsNotEmpty() ? PClass::FindClass(telefogsrc) : NULL; - const PClass * const dest = telefogdest.IsNotEmpty() ? PClass::FindClass(telefogdest) : NULL; + const PClass *src = PClass::FindClass(telefogsrc); + const PClass * dest = PClass::FindClass(telefogdest); while ((actor = iterator.Next())) { if (telefogsrc.IsNotEmpty()) diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp index 95f1c463c..27ceeb698 100644 --- a/src/thingdef/thingdef_properties.cpp +++ b/src/thingdef/thingdef_properties.cpp @@ -1410,8 +1410,7 @@ DEFINE_PROPERTY(stamina, I, Actor) DEFINE_PROPERTY(telefogsourcetype, S, Actor) { PROP_STRING_PARM(str, 0); - if (!stricmp(str, "") || !stricmp(str, "none")) defaults->TeleFogSourceType = NULL; - else defaults->TeleFogSourceType = FindClassTentative(str,"TeleportFog"); + defaults->TeleFogSourceType = FindClassTentative(str,"Actor"); } //========================================================================== @@ -1420,8 +1419,7 @@ DEFINE_PROPERTY(telefogsourcetype, S, Actor) DEFINE_PROPERTY(telefogdesttype, S, Actor) { PROP_STRING_PARM(str, 0); - if (!stricmp(str, "") || !stricmp(str, "none")) defaults->TeleFogDestType = NULL; - else defaults->TeleFogDestType = FindClassTentative(str, "TeleportFog"); + defaults->TeleFogDestType = FindClassTentative(str, "Actor"); } //==========================================================================