summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-12-12 21:07:29 -0600
committerColin Noga <Tempus@chronometry.ca>2012-12-12 21:07:29 -0600
commit3ed50f896ac5bcaf573137d9058982f51bedfa16 (patch)
treeb28feb60d7fde744c30b54beaed85562fd4856e1 /include
parentaf97632dc139e495f775cb9f065a48c258942b35 (diff)
downloadkamek-3ed50f896ac5bcaf573137d9058982f51bedfa16.tar.gz
kamek-3ed50f896ac5bcaf573137d9058982f51bedfa16.zip
Made giant Shy Guys, also learned about Mario bouncing
Diffstat (limited to 'include')
-rwxr-xr-xinclude/game.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/game.h b/include/game.h
index e19166a..3a24aba 100755
--- a/include/game.h
+++ b/include/game.h
@@ -2428,7 +2428,7 @@ public:
virtual void add2ToYSpeed();
virtual bool _vf218(); // stuff with floats and camera
virtual void _vf21C(); // does stuff with the speeds
- virtual void _vf220(void *other); // some type of actor, PlBase? calls vf3F4 on other with r4=this, r5=0
+ virtual void _vf220(void *player); // hurts player
virtual void _vf224(); // stores a couple of values into the struct at 464
virtual void _vf228(); // more fun stuff with 464 and floats
virtual bool CreateIceActors(); // does stuff involving ICE_ACTORs and arrays
@@ -2439,7 +2439,7 @@ public:
virtual void _vf240(); // nullsub, params unknown
virtual int _vf244(); // returns 0. might be bool. params unknown
virtual int _vf248(int something); // does some math involving field510 and [7,7,4,0] and param
- virtual void _vf24C(void *other); // deals with something in the class involving the bahp flag
+ virtual void bouncePlayerWhenJumpedOn(void *player);
virtual void addScoreWhenHit(void *other); // Other is dPlayer
virtual void _vf254(void *other);
virtual void _vf258(void *other);
@@ -2466,6 +2466,8 @@ public:
void checkLiquidImmersion(Vec2 *effectivePosition, float effectScale);
void killWithSpecifiedState(dStageActor_c *killedBy, VEC2 *effectiveSpeed, dStateBase_c *state, u32 _unused=0);
+ void bouncePlayer(void* player, float bounceHeight);
+
// States
USING_STATES(dEn_c);