diff --git a/src/g_shared/a_sectoraction.cpp b/src/g_shared/a_sectoraction.cpp index 5c180cc47..6cc285afa 100644 --- a/src/g_shared/a_sectoraction.cpp +++ b/src/g_shared/a_sectoraction.cpp @@ -39,12 +39,9 @@ IMPLEMENT_CLASS(ASectorAction, false, false) -ASectorAction::ASectorAction (bool activatedByUse) : - ActivatedByUse (activatedByUse) {} - bool ASectorAction::IsActivatedByUse() const { - return ActivatedByUse; + return !!(health & (SECSPAC_Use|SECSPAC_UseWall)); } void ASectorAction::OnDestroy () diff --git a/src/r_defs.h b/src/r_defs.h index c1bee09cf..e3eed8135 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -282,7 +282,6 @@ class ASectorAction : public AActor { DECLARE_CLASS (ASectorAction, AActor) public: - ASectorAction (bool activatedByUse = false); void OnDestroy() override; void BeginPlay (); void Activate (AActor *source); @@ -292,8 +291,6 @@ public: virtual bool DoTriggerAction(AActor *triggerer, int activationType); protected: bool CheckTrigger(AActor *triggerer) const; -private: - bool ActivatedByUse; }; class ASkyViewpoint;