mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 23:36:22 +00:00
Code Issues Projects Releases Wiki Activity

Changed unk_192 to timer, as well as add missing trailing comma for formating (#817)

Browse source
This commit is contained in:
Derek Hensley 2021-05-18 12:40:26 -07:00 committed by GitHub
parent d9a4a2079d
commit c9ee9e43bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c
View file

@ -26,23 +26,25 @@ const ActorInit En_M_Fire1_InitVars = {
NULL,
};
static ColliderCylinderInit sCylinderInit = { {
COLTYPE_NONE,
AT_ON | AT_TYPE_PLAYER,
AC_NONE,
OC1_NONE,
OC2_TYPE_PLAYER,
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK2,
{ 0x00000001, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
TOUCH_ON | TOUCH_SFX_NONE,
BUMP_NONE,
OCELEM_NONE,
},
{ 200, 200, 0, { 0 } } };
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
AT_ON | AT_TYPE_PLAYER,
AC_NONE,
OC1_NONE,
OC2_TYPE_PLAYER,
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK2,
{ 0x00000001, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
TOUCH_ON | TOUCH_SFX_NONE,
BUMP_NONE,
OCELEM_NONE,
},
{ 200, 200, 0, { 0 } },
};
void EnMFire1_Init(Actor* thisx, GlobalContext* globalCtx) {
EnMFire1* this = THIS;
@ -66,7 +68,7 @@ void EnMFire1_Update(Actor* thisx, GlobalContext* globalCtx) {
EnMFire1* this = THIS;
s32 pad;
if (Math_StepToF(&this->unk_198, 1.0f, 0.2f)) {
if (Math_StepToF(&this->timer, 1.0f, 0.2f)) {
Actor_Kill(&this->actor);
} else {
Collider_UpdateCylinder(&this->actor, &this->collider);

2
src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
View file

@ -9,7 +9,7 @@ struct EnMFire1;
typedef struct EnMFire1 {
/* 0x0000 */ Actor actor;
/* 0x014C */ ColliderCylinder collider;
/* 0x0198 */ f32 unk_198;
/* 0x0198 */ f32 timer;
} EnMFire1; // size = 0x019C
extern const ActorInit En_M_Fire1_InitVars;