diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2013-05-09 15:50:30 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2013-05-09 15:50:30 -0500 |
| commit | c739499b42c335bed7e37807c99a5c53ae9e1598 (patch) | |
| tree | c9e5d6cfc45a81ab70fb5394e9c6595148b6d27e | |
| parent | 91d74e0e07f041c53a3d31beaaf1ed26ceb0195a (diff) | |
| parent | 00296013260a730e8c24ca53a6e3a3e0a1e49131 (diff) | |
| download | kamek-c739499b42c335bed7e37807c99a5c53ae9e1598.tar.gz kamek-c739499b42c335bed7e37807c99a5c53ae9e1598.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
| -rw-r--r-- | src/koopatlas/map.cpp | 4 | ||||
| -rw-r--r-- | src/shyguy.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/koopatlas/map.cpp b/src/koopatlas/map.cpp index 84c7c45..865bfa5 100644 --- a/src/koopatlas/map.cpp +++ b/src/koopatlas/map.cpp @@ -72,8 +72,8 @@ int dWMMap_c::onCreate() { switch (dScKoopatlas_c::instance->currentMapID) { case 5: // Starry Sky launchStarX = 5424.0f; launchStarY = -4416.0f; showLaunchStar = true; break; - case 11: // Sky City - launchStarX = 3216.0f; launchStarY = -3120.0f; showLaunchStar = true; break; + // case 11: // Sky City + // launchStarX = 3216.0f; launchStarY = -3120.0f; showLaunchStar = true; break; case 6: // Planet Koopa lsRotate = true; launchStarX = 2268.0f; launchStarY = -3420.0f; showLaunchStar = true; break; diff --git a/src/shyguy.cpp b/src/shyguy.cpp index 354f2f6..2ebb3bb 100644 --- a/src/shyguy.cpp +++ b/src/shyguy.cpp @@ -784,6 +784,7 @@ void daShyGuy::updateModelMatrices() { this->x_speed_inc = 0.0; } void daShyGuy::executeState_Walk() { + chrAnimation.setUpdateRate(1.5f); this->pos.x += (direction) ? -0.4 : 0.4; @@ -1232,6 +1233,7 @@ bool daShyGuy::willWalkOntoSuitableGround() { this->y_speed_inc = -0.1875; } void daShyGuy::executeState_RealWalk() { + chrAnimation.setUpdateRate(1.5f); bool turne = this->willWalkOntoSuitableGround(); // bool turne = collMgr.isOnTopOfTile(); |