github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 22:33:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIXED: Dark Link Apparition + Kokiri NPC spawn

Browse source
This commit is contained in:
PurpleHato 2022-05-22 15:40:12 +02:00
commit 247bbd9604
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/src/code/z_actor.c
View file

@ -1163,7 +1163,7 @@ void Actor_Init(Actor* actor, GlobalContext* globalCtx) {
actor->uncullZoneForward = 1000.0f; actor->uncullZoneForward = 1000.0f;
actor->uncullZoneScale = 350.0f; actor->uncullZoneScale = 350.0f;
actor->uncullZoneDownward = 700.0f; actor->uncullZoneDownward = 700.0f;
if (CVar_GetS32("gDisableDrawDistance", 0) != 0) { if (CVar_GetS32("gDisableDrawDistance", 0) != 0 && actor->id != ACTOR_EN_TORCH2 && actor->id != ACTOR_EN_BLKOBJ) { // Extra check for Dark Link and his room
actor->uncullZoneForward = 32767.0f; actor->uncullZoneForward = 32767.0f;
actor->uncullZoneScale = 32767.0f; actor->uncullZoneScale = 32767.0f;
actor->uncullZoneDownward = 32767.0f; actor->uncullZoneDownward = 32767.0f;
@ -2690,7 +2690,7 @@ s32 func_800314B0(GlobalContext* globalCtx, Actor* actor) {
s32 func_800314D4(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3) { s32 func_800314D4(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3) {
f32 var; f32 var;
if (CVar_GetS32("gDisableDrawDistance", 0) != 0) { if (CVar_GetS32("gDisableDrawDistance", 0) != 0 && actor->id != ACTOR_EN_TORCH2 && actor->id != ACTOR_EN_BLKOBJ) { // Extra check for Dark Link and his room
return true; return true;
} }

2
soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
View file

@ -1053,7 +1053,7 @@ void func_80A98CD8(EnKo* this) {
this->actor.targetMode = info->targetMode; this->actor.targetMode = info->targetMode;
this->lookDist = info->lookDist; this->lookDist = info->lookDist;
this->lookDist += this->collider.dim.radius; this->lookDist += this->collider.dim.radius;
this->appearDist = info->appearDist; this->appearDist = CVar_GetS32("gDisableDrawDistance", 0) != 0 ? 32767 : info->appearDist;
} }
// Used to fetch actor animation? // Used to fetch actor animation?