mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 08:50:23 +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

10
src/overlays/actors/ovl_Demo_Im/z_demo_im.c
View file

@ -310,7 +310,7 @@ void func_80985358(DemoIm* this, GlobalContext* globalCtx) {
f32 posY = this->actor.posRot.pos.y;
f32 posZ = this->actor.posRot.pos.z;
Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2);
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2);
}
void func_809853B4(DemoIm* this, GlobalContext* globalCtx) {
@ -319,8 +319,8 @@ void func_809853B4(DemoIm* this, GlobalContext* globalCtx) {
f32 playerY = player->actor.posRot.pos.y + 80.0f;
f32 playerZ = player->actor.posRot.pos.z;
Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, playerX, playerY, playerZ, 0,
0, 0, 0xD);
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, playerX, playerY, playerZ, 0,
0, 0, 0xD);
Item_Give(globalCtx, GI_BOMBCHUS_5);
}
@ -440,8 +440,8 @@ void func_809858A8(void) {
}
void func_809858C8(DemoIm* this, GlobalContext* globalCtx) {
Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x,
(kREG(17) + 24.0f) + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 6);
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x,
(kREG(17) + 24.0f) + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 6);
}
void func_80985948(DemoIm* this, GlobalContext* globalCtx) {