summaryrefslogtreecommitdiff
path: root/include/game.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/game.h')
-rwxr-xr-xinclude/game.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/game.h b/include/game.h
index 5c7ac05..300efec 100755
--- a/include/game.h
+++ b/include/game.h
@@ -2354,22 +2354,22 @@ public:
virtual void yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther);
// WHAT A MESS
- virtual void collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat5_Mario(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void _vf108(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void _vf110(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat8_FencePunch(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void _vf120(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCat5_Mario(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool _vf108(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCatD_Drill(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool _vf110(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCat8_FencePunch(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool _vf120(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther);
virtual bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual bool collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther);
virtual void _vf140(dStageActor_c *actor);
virtual void _vf144(int something);