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/topman.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/topman.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/topman.cpp b/src/topman.cpp index cebf626..3d309a6 100644 --- a/src/topman.cpp +++ b/src/topman.cpp @@ -39,7 +39,6 @@ class daTopman : public dEn_c { void updateModelMatrices(); bool calculateTileCollisions(); - // void spriteCollision(ActivePhysics *apThis, ActivePhysics *apOther); void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther); void yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther); @@ -259,7 +258,7 @@ bool daTopman::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) ? -0.8f : 0.8f; } else { x_speed_inc = 0.0f; } |