From ead424d6a5929fc225c5eee08473cf01babf6115 Mon Sep 17 00:00:00 2001 From: bomba1749 <58524643+bomba1749@users.noreply.github.com> Date: Thu, 29 Jun 2023 20:32:54 -0400 Subject: [PATCH] moved ASList to its own file --- src/KingSystem/ActorSystem/actActor.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/KingSystem/ActorSystem/actActor.h b/src/KingSystem/ActorSystem/actActor.h index ce14c73a..87b41aa7 100644 --- a/src/KingSystem/ActorSystem/actActor.h +++ b/src/KingSystem/ActorSystem/actActor.h @@ -18,6 +18,7 @@ #include "KingSystem/Map/mapMubinIter.h" #include "KingSystem/Utils/AtomicLongBitFlag.h" #include "KingSystem/Utils/Thread/ActorMessageTransceiver.h" +#include "KingSystem/ActorSystem/AS/ASList.h" namespace gsys { class Model; @@ -25,9 +26,7 @@ class Model; namespace ksys { -namespace as { -class ASList; -} // namespace as + namespace map { class Object; @@ -137,6 +136,7 @@ public: const ActorParam* getParam() const { return mActorParam; } map::Object* getMapObject() const { return mMapObject; } const map::MubinIter& getMapObjIter() const { return mMapObjIter; } + as::ASList* getASList() const { return mASList; } const sead::Matrix34f& getMtx() const { return mMtx; } const sead::Vector3f& getVelocity() const { return mVelocity; } @@ -145,7 +145,9 @@ public: phys::RigidBody* getMainBody() const { return mMainBody; } phys::RigidBody* getTgtBody() const { return mTgtBody; } - const MesTransceiverId* getMesTransceiverId() const { return mMsgTransceiver.getId(); } +const MesTransceiverId* getMesTransceiverId() const { return mMsgTransceiver.getId(); } + void sendMessage(const MesTransceiverId& dest, const MessageType& type, void* user_data, + bool ack); f32 getDeleteDistance() const { return sead::Mathf::sqrt(sead::Mathf::clampMin(mDeleteDistanceSq, 0.0f));