diff options
Diffstat (limited to '')
| -rw-r--r-- | src/bossMegaGoomba.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/bossMegaGoomba.cpp b/src/bossMegaGoomba.cpp index 996a609..f701ee7 100644 --- a/src/bossMegaGoomba.cpp +++ b/src/bossMegaGoomba.cpp @@ -117,10 +117,6 @@ void HexDump(char* address, u32 length) { extern "C" void *PlaySound(daMegaGoomba_c *, int soundID); -//FIXME make these dEn_c::HandleXSpeed(); -extern "C" void *HandleXSpeed(daMegaGoomba_c *); -extern "C" void *HandleYSpeed(daMegaGoomba_c *); -extern "C" void *UpdateObjectPosBasedOnSpeedValues_real(daMegaGoomba_c *); extern "C" u32 GenerateRandomNumber(int max); extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(daMegaGoomba_c *, Vec pos); extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer); @@ -128,7 +124,6 @@ extern "C" dStageActor_c *GetSpecificPlayerActor(int number); //FIXME make this dEn_c->used... extern "C" char usedForDeterminingStatePress_or_playerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther, int unk1); -extern "C" void doSpriteMovement(dStageActor_c* actor); extern "C" int SomeStrangeModification(dStageActor_c* actor); extern "C" void DoStuffAndMarkDead(dStageActor_c *actor, Vec vector, float unk); extern "C" int SmoothRotation(short* rot, u16 amt, int unk2); @@ -235,10 +230,10 @@ void daMegaGoomba_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOth //FIXME hack to make multiple playerCollisions work this->isDead = 0; this->flags_4FC |= (1<<(31-7)); - if(apOther->owner->_38D > 3) { - OSReport("!!!ATTENTION!!!\napOther->owner->_38D > 3\n"); + if(apOther->owner->which_player > 3) { + OSReport("!!!ATTENTION!!!\napOther->owner->which_player > 3\n"); }else{ - this->counter_504[apOther->owner->_38D] = 0; + this->counter_504[apOther->owner->which_player] = 0; } } @@ -613,8 +608,8 @@ void daMegaGoomba_c::executeState_Turn() { this->bodyModel._vf1C(); this->animationPat.process(); - HandleYSpeed(this); - doSpriteMovement(this); + this->HandleYSpeed(); + this->doSpriteMovement(); /*this->_vf2D0(); //nullsub();*/ int ret = SomeStrangeModification(this); @@ -650,9 +645,9 @@ void daMegaGoomba_c::executeState_Walk() { this->bodyModel._vf1C(); this->animationPat.process(); //HOMEMADE// - HandleXSpeed(this); - HandleYSpeed(this); - doSpriteMovement(this); + this->HandleXSpeed(); + this->HandleYSpeed(); + this->doSpriteMovement(); u16 amt = (this->direction == 0) ? 0x2000 : 0xE000; SmoothRotation(&this->rot.y, amt, 0x200); /*this->_vf2D0(); //nullsub();*/ |