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

Fixes

Browse source
This commit is contained in:
Sirius902 2020-09-30 18:21:58 -07:00
parent 0bcc99778c
commit 7ebec4cae0
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -125,7 +125,7 @@ const ActorInit En_Ik_InitVars = {
(ActorFunc)EnIk_Draw, (ActorFunc)EnIk_Draw,
}; };
Vec3s D_80A78FA0; Vec3f D_80A78FA0;
void EnIk_Destroy(Actor* thisx, GlobalContext* globalCtx) { void EnIk_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS; EnIk* this = THIS;
@ -150,12 +150,14 @@ void func_80A74398(EnIk* this, GlobalContext* globalCtx) {
this->actor.update = func_80A75FA0; this->actor.update = func_80A75FA0;
this->actor.draw = func_80A76798; this->actor.draw = func_80A76798;
this->actor.flags |= 0x400; this->actor.flags |= 0x400;
Collider_InitCylinder(globalCtx, &this->unk_320); Collider_InitCylinder(globalCtx, &this->unk_320);
Collider_SetCylinder(globalCtx, &this->unk_320, &this->actor, &D_80A78340); Collider_SetCylinder(globalCtx, &this->unk_320, &this->actor, &D_80A78340);
Collider_InitTris(globalCtx, &this->unk_3EC); Collider_InitTris(globalCtx, &this->unk_3EC);
Collider_SetTris(globalCtx, &this->unk_3EC, &this->actor, &D_80A783E4, this->unk_40C); Collider_SetTris(globalCtx, &this->unk_3EC, &this->actor, &D_80A783E4, this->unk_40C);
Collider_InitQuad(globalCtx, &this->unk_36C); Collider_InitQuad(globalCtx, &this->unk_36C);
Collider_SetQuad(globalCtx, &this->unk_36C, &this->actor, &D_80A783F4); Collider_SetQuad(globalCtx, &this->unk_36C, &this->actor, &D_80A783F4);
this->actor.colChkInfo.damageTable = &D_80A78444; this->actor.colChkInfo.damageTable = &D_80A78444;
this->actor.params &= 0xFF; this->actor.params &= 0xFF;
this->actor.colChkInfo.mass = 0xFE; this->actor.colChkInfo.mass = 0xFE;
@ -188,6 +190,7 @@ void func_80A74398(EnIk* this, GlobalContext* globalCtx) {
Effect_Add(globalCtx, &this->blureIdx, EFFECT_BLURE1, 0, 0, &blureInit); Effect_Add(globalCtx, &this->blureIdx, EFFECT_BLURE1, 0, 0, &blureInit);
func_80A74714(this); func_80A74714(this);
if (this->switchFlags != 0xFF) { if (this->switchFlags != 0xFF) {
if (Flags_GetSwitch(globalCtx, this->switchFlags)) { if (Flags_GetSwitch(globalCtx, this->switchFlags)) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
@ -302,7 +305,7 @@ void func_80A772EC(EnIk* this, GlobalContext* globalCtx) {
s32 pad[2]; s32 pad[2];
f32 wDest; f32 wDest;
SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &this->actor.posRot, &D_80A78FA0, &wDest); SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &this->actor.posRot.pos, &D_80A78FA0, &wDest);
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_DEAD, &D_80A78FA0, 4, &D_801333E0, &D_801333E0, &D_801333E8); Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_DEAD, &D_80A78FA0, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} }