mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-08-28 16:12:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

ksys: Merge EcoUtil into ActorUtil

Browse Source 
The "is in Satori mountain area" function actually appears to be part
of ActorUtil (which contains a bunch of actor-related helper functions)
This commit is contained in:
Léo Lam
2021-11-24 01:59:32 +01:00
parent 022f029db1
commit c0a79e67ee
7 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/ActorSystem/actActorUtil.cpp
+5
View File
@@ -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
src/KingSystem/ActorSystem/actActorUtil.h
+2
View File
@@ -167,4 +167,6 @@ bool getSameGroupActorName(sead::SafeString* name, const sead::SafeString& actor
s32 getSelectedChoiceIdx(s32 max, const char* query_name);
bool isInSatoriMountainArea(const sead::Vector3f& pos);
} // namespace ksys::act