diff options
| author | Treeki <treeki@gmail.com> | 2013-02-03 00:31:46 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-02-03 00:31:46 +0100 |
| commit | 06828e3a02a0ca2eaf56d804bb6845659cfa59e7 (patch) | |
| tree | bb28c665445fc622958b9614d014ba791cad2d0f /include/game.h | |
| parent | 012efaa6343cd2bec2f728d0bec6243263712a45 (diff) | |
| download | kamek-06828e3a02a0ca2eaf56d804bb6845659cfa59e7.tar.gz kamek-06828e3a02a0ca2eaf56d804bb6845659cfa59e7.zip | |
fix a bug in the collision headers, and assorted collision bugs
Diffstat (limited to 'include/game.h')
| -rwxr-xr-x | include/game.h | 30 |
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);
|