mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Formatting

Browse source
This commit is contained in:
Ethan Roseman 2020-03-23 15:25:23 -04:00
parent 1042a72fd2
commit ea3f70cd68
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c
View file

@ -18,8 +18,7 @@ static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx);
static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx); static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx);
static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx); static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx);
const ActorInit Bg_Haka_Megane_InitVars = const ActorInit Bg_Haka_Megane_InitVars = {
{
ACTOR_BG_HAKA_MEGANE, ACTOR_BG_HAKA_MEGANE,
ACTORTYPE_PROP, ACTORTYPE_PROP,
ROOM, ROOM,
@ -84,8 +83,8 @@ static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) {
collision = collisions[this->dyna.actor.params]; collision = collisions[this->dyna.actor.params];
if (collision != 0) { if (collision != 0) {
DynaPolyInfo_Alloc(collision, &localC); DynaPolyInfo_Alloc(collision, &localC);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId =
&this->dyna.actor, localC); DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, localC);
} }
} else { } else {
this->actionFunc = (ActorFunc)func_8087DC64; this->actionFunc = (ActorFunc)func_8087DC64;
@ -105,7 +104,6 @@ static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) {
} }
static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx) { static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx) {
} }
static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx) { static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx) {