mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-09-02 01:42:54 -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/World/worldTimeMgr.cpp
+3 -3
View File
@@ -2,7 +2,7 @@
#include <random/seadGlobalRandom.h>
#include "KingSystem/ActorSystem/actActorConstDataAccess.h"
#include "KingSystem/ActorSystem/actActorSystem.h"
#include "KingSystem/Ecosystem/ecoUtil.h"
#include "KingSystem/ActorSystem/actActorUtil.h"
#include "KingSystem/Event/evtManager.h"
#include "KingSystem/Event/evtMetadata.h"
#include "KingSystem/GameData/gdtManager.h"
@@ -590,7 +590,7 @@ void TimeMgr::AnimalMasterController::calc() {
if (!player_accessor.hasProc())
break;
if (eco::currentAreaNumIs64(player_accessor.getPreviousPos()))
if (act::isInSatoriMountainArea(player_accessor.getPreviousPos()))
break;
appearance_hour = sead::GlobalRandom::instance()->getU32(23);
@@ -602,7 +602,7 @@ void TimeMgr::AnimalMasterController::calc() {
if (!player_accessor.hasProc())
break;
if (eco::currentAreaNumIs64(player_accessor.getPreviousPos())) {
if (act::isInSatoriMountainArea(player_accessor.getPreviousPos())) {
state = 0;
break;
}