diff options
author | megazig <megazig@megazig-laptop.lightning.home> | 2012-01-12 19:39:28 -0600 |
---|---|---|
committer | megazig <megazig@megazig-laptop.lightning.home> | 2012-01-12 19:39:28 -0600 |
commit | 1cac64b9ff7384af650fed2bef25fa27069fd589 (patch) | |
tree | fdbb65c847aa5183ceb2cf6ae1118b03f2a96a36 /src/bossRamboo.cpp | |
parent | 81edb47b7f677ba37e81f896645ecdc023f4adb9 (diff) | |
download | kamek-1cac64b9ff7384af650fed2bef25fa27069fd589.tar.gz kamek-1cac64b9ff7384af650fed2bef25fa27069fd589.zip |
fixes for using class functions instead of extern'd calls
updated full daEnDosun_c definition
half working daEnMegaDosun_c
Diffstat (limited to '')
-rw-r--r-- | src/bossRamboo.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bossRamboo.cpp b/src/bossRamboo.cpp index 598cf75..3ed947d 100644 --- a/src/bossRamboo.cpp +++ b/src/bossRamboo.cpp @@ -62,9 +62,6 @@ daRamboo_c *daRamboo_c::build() { } -extern "C" void *HandleXSpeed(daRamboo_c *); -extern "C" void *HandleYSpeed(daRamboo_c *); -extern "C" void *UpdateObjectPosBasedOnSpeedValues_real(daRamboo_c *); extern "C" u32 GenerateRandomNumber(int max); extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer); extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(daRamboo_c *, Vec pos); @@ -105,7 +102,8 @@ void daRamboo_c::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysic CreateEffect(380, &apOther->owner->pos); doStateChange(&StateID_Flee); - apOther->owner->Delete(); + //FIXME changed to dStageActor_c::Delete(u8) from fBase_c::Delete(void) + apOther->owner->Delete(apOther->owner->_390); } } void daRamboo_c::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) { OSReport("Hit Hammer"); } |