From c2b92e563229d633fefcabb4544b3bf73dc40db0 Mon Sep 17 00:00:00 2001 From: Colin Noga Date: Mon, 13 May 2013 09:57:02 -0500 Subject: Fixes to world map messages, roll your own model, shy guy giant and topman speeds --- src/shyguyGiants.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/shyguyGiants.cpp') 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; } -- cgit v1.2.3