mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +00:00
Code Issues Projects Releases Wiki Activity

attchaedA/attachedB renamed to parent/child (#358)

Browse source 
* fix colliderinit typo

* rename parent/child

* cleanup

* forgot to change something in functions.h

* SpawnAsChild

* format
This commit is contained in:
fig02 2020-08-29 18:25:16 -04:00 • committed by GitHub
parent 468c592792
commit 1f1b5e39f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
233 changed files with 584 additions and 585 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
View file

@ -513,11 +513,11 @@ void func_80B4BF2C(EnZl1* this, GlobalContext* globalCtx) {
break;
}
case 2:
if (func_8002F410(this, globalCtx) != 0) {
if (Actor_HasParent(this, globalCtx)) {
func_800C078C(globalCtx, 0, this->unk_1E8);
Gameplay_ChangeCameraStatus(globalCtx, 0, 7);
Gameplay_ClearCamera(globalCtx, this->unk_1E8);
this->actor.attachedA = NULL;
this->actor.parent = NULL;
this->unk_1E2 += 1;
} else {
func_8002F434(this, globalCtx, GI_LETTER_ZELDA, 120.0f, 10.0f);