diff options
author | Colin Noga <Tempus@chronometry.ca> | 2013-05-13 09:57:02 -0500 |
---|---|---|
committer | Colin Noga <Tempus@chronometry.ca> | 2013-05-13 09:57:02 -0500 |
commit | c2b92e563229d633fefcabb4544b3bf73dc40db0 (patch) | |
tree | ab58f26923e7e527645edddde2266b6c65147711 /src/shyguyGiants.cpp | |
parent | 5c519288c928f4136b973613733e70b829dda480 (diff) | |
download | kamek-c2b92e563229d633fefcabb4544b3bf73dc40db0.tar.gz kamek-c2b92e563229d633fefcabb4544b3bf73dc40db0.zip |
Fixes to world map messages, roll your own model, shy guy giant and topman speeds
Diffstat (limited to '')
-rw-r--r-- | src/shyguyGiants.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shyguyGiants.cpp b/src/shyguyGiants.cpp index aefcb3c..a2c4008 100644 --- a/src/shyguyGiants.cpp +++ b/src/shyguyGiants.cpp @@ -161,8 +161,8 @@ daShyGuyGiant *daShyGuyGiant::build() { } } } -void daShyGuyGiant::_vf278(void *other) { - PlaySound(this, SE_EMY_HANACHAN_STOMP); + void daShyGuyGiant::_vf278(void *other) { + PlaySound(this, SE_EMY_HANACHAN_STOMP); } void daShyGuyGiant::bouncePlayerWhenJumpedOn(void *player) { @@ -300,7 +300,7 @@ bool daShyGuyGiant::calculateTileCollisions() { // u8 one = (blah & 0xFF); // static const float incs[5] = {0.00390625f, 0.0078125f, 0.015625f, 0.0234375f, 0.03125f}; // x_speed_inc = incs[one]; - max_speed.x = (direction == 1) ? -1.0f : 1.0f; + max_speed.x = (direction == 1) ? -this->XSpeed : this->XSpeed; } else { x_speed_inc = 0.0f; } |