mirror of
https://github.com/blawar/ooot.git
synced 2024-07-01 00:33:19 +00:00
arrow fixes
This commit is contained in:
parent
fe0896f19e
commit
0bec38a09a
|
@ -104,7 +104,7 @@ void ArrowFire_Hit(ArrowFire* pthis, GlobalContext* globalCtx)
|
|||
{
|
||||
f32 scale;
|
||||
f32 offset;
|
||||
u16 timer;
|
||||
Timer timer;
|
||||
|
||||
if(pthis->actor.projectedW < 50.0f)
|
||||
{
|
||||
|
@ -123,8 +123,7 @@ void ArrowFire_Hit(ArrowFire* pthis, GlobalContext* globalCtx)
|
|||
}
|
||||
}
|
||||
|
||||
timer = pthis->timer;
|
||||
if(timer != 0)
|
||||
if(pthis->timer != 0)
|
||||
{
|
||||
pthis->timer -= 1;
|
||||
|
||||
|
@ -136,9 +135,6 @@ void ArrowFire_Hit(ArrowFire* pthis, GlobalContext* globalCtx)
|
|||
pthis->unk_158 += ((2.0f - pthis->unk_158) * 0.1f);
|
||||
if(pthis->timer < 16)
|
||||
{
|
||||
if(1)
|
||||
{
|
||||
}
|
||||
pthis->alpha = ((pthis->timer * 0x23) - 0x118);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,6 +16,6 @@ struct ArrowFire
|
|||
/* 0x015C */ f32 unk_15C;
|
||||
/* 0x0160 */ ArrowFireActionFunc actionFunc;
|
||||
/* 0x0164 */ s16 radius;
|
||||
/* 0x0166 */ u16 timer;
|
||||
/* 0x0166 */ Timer timer;
|
||||
/* 0x0168 */ u8 alpha;
|
||||
};
|
||||
|
|
|
@ -104,7 +104,6 @@ void ArrowIce_Hit(ArrowIce* pthis, GlobalContext* globalCtx)
|
|||
{
|
||||
f32 scale;
|
||||
f32 offset;
|
||||
u16 timer;
|
||||
|
||||
if(pthis->actor.projectedW < 50.0f)
|
||||
{
|
||||
|
@ -123,8 +122,7 @@ void ArrowIce_Hit(ArrowIce* pthis, GlobalContext* globalCtx)
|
|||
}
|
||||
}
|
||||
|
||||
timer = pthis->timer;
|
||||
if(timer != 0)
|
||||
if(pthis->timer != 0)
|
||||
{
|
||||
pthis->timer -= 1;
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ struct ArrowIce
|
|||
{
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ s16 radius;
|
||||
/* 0x014E */ u16 timer;
|
||||
/* 0x014E */ Timer timer;
|
||||
/* 0x0150 */ u8 alpha;
|
||||
/* 0x0154 */ Vec3f unkPos;
|
||||
/* 0x0160 */ f32 unk_160;
|
||||
|
|
|
@ -103,7 +103,6 @@ void ArrowLight_Hit(ArrowLight* pthis, GlobalContext* globalCtx)
|
|||
{
|
||||
f32 scale;
|
||||
f32 offset;
|
||||
u16 timer;
|
||||
|
||||
if(pthis->actor.projectedW < 50.0f)
|
||||
{
|
||||
|
@ -122,8 +121,7 @@ void ArrowLight_Hit(ArrowLight* pthis, GlobalContext* globalCtx)
|
|||
}
|
||||
}
|
||||
|
||||
timer = pthis->timer;
|
||||
if(timer != 0)
|
||||
if(pthis->timer != 0)
|
||||
{
|
||||
pthis->timer -= 1;
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ struct ArrowLight
|
|||
{
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ s16 radius;
|
||||
/* 0x014E */ u16 timer;
|
||||
/* 0x014E */ Timer timer;
|
||||
/* 0x0150 */ u8 alpha;
|
||||
/* 0x0154 */ Vec3f unkPos;
|
||||
/* 0x0160 */ f32 unk_160;
|
||||
|
|
Loading…
Reference in New Issue
Block a user