CActor: Remove sound emitter on destroy

AxioDL · Aug 15, 2022 · 279ad54 · 279ad54
1 parent 7ef204c
commit 279ad54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Runtime/World/CActor.cpp b/Runtime/World/CActor.cpp
@@ -60,6 +60,8 @@ CActor::CActor(TUniqueId uid, bool active, std::string_view name, const CEntityI
     x98_scanObjectInfo = g_SimplePool->GetObj(SObjectTag{FOURCC('SCAN'), params.x40_scanParms.GetScanId()});
 }
 
+CActor::~CActor() { RemoveEmitter(); }
+
 void CActor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
   switch (msg) {
   case EScriptObjectMessage::Activate: {

diff --git a/Runtime/World/CActor.hpp b/Runtime/World/CActor.hpp
@@ -100,6 +100,7 @@ class CActor : public CEntity {
   DEFINE_ENTITY
   CActor(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info, const zeus::CTransform&,
          CModelData&& mData, const CMaterialList& list, const CActorParameters& params, TUniqueId otherUid);
+  ~CActor();
 
   void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
   void SetActive(bool active) override {