From c0a79e67eeb8bc7f41889cc0fc9ea1808cf6341e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Wed, 24 Nov 2021 01:59:32 +0100 Subject: ksys: Merge EcoUtil into ActorUtil The "is in Satori mountain area" function actually appears to be part of ActorUtil (which contains a bunch of actor-related helper functions) --- src/KingSystem/ActorSystem/actActorUtil.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/KingSystem/ActorSystem/actActorUtil.cpp') diff --git a/src/KingSystem/ActorSystem/actActorUtil.cpp b/src/KingSystem/ActorSystem/actActorUtil.cpp index 75de3637..95062d8e 100644 --- a/src/KingSystem/ActorSystem/actActorUtil.cpp +++ b/src/KingSystem/ActorSystem/actActorUtil.cpp @@ -8,6 +8,7 @@ #include "KingSystem/ActorSystem/actBaseProcLink.h" #include "KingSystem/ActorSystem/actInfoData.h" #include "KingSystem/ActorSystem/actTag.h" +#include "KingSystem/Ecosystem/ecoSystem.h" #include "KingSystem/GameData/gdtManager.h" #include "KingSystem/Map/mapObject.h" #include "KingSystem/Map/mapPlacementMgr.h" @@ -585,4 +586,8 @@ bool getSameGroupActorName(sead::SafeString* name, const sead::SafeString& actor return true; } +bool isInSatoriMountainArea(const sead::Vector3f& pos) { + return eco::Ecosystem::instance()->getFieldMapArea(pos.x, pos.z) == 64; +} + } // namespace ksys::act -- cgit v1.2.3