diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-11-15 13:21:41 -0600 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-11-15 13:21:41 -0600 |
| commit | ada63c188cf80a3b8436b09d8eea0cb0d37a7586 (patch) | |
| tree | 7d7f622d460ecbf62340bf53d8644d378a1df0e0 | |
| parent | 486a7c1c98a072dee5b9e1c383962998da55d3bb (diff) | |
| download | kamek-ada63c188cf80a3b8436b09d8eea0cb0d37a7586.tar.gz kamek-ada63c188cf80a3b8436b09d8eea0cb0d37a7586.zip | |
pathmanager fixes
| -rw-r--r-- | src/koopatlas/pathmanager.cpp | 4 | ||||
| -rw-r--r-- | src/koopatlas/shop.cpp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp index 155e27c..002b400 100644 --- a/src/koopatlas/pathmanager.cpp +++ b/src/koopatlas/pathmanager.cpp @@ -571,8 +571,8 @@ void dWMPathManager_c::startMovementTo(dKPPath_s *path) { player->rot.y = (Animations[id].forceRotation != -1) ? Animations[id].forceRotation : direction; - moveSpeed = (Animations[id].forceSpeed >= 0.0f) ? Animations[id].forceSpeed : 3.0f; + moveSpeed = path->speed * moveSpeed; if (Animations[id].repeatEffect) { player->hasEffect = true; @@ -808,7 +808,7 @@ void dWMPathManager_c::activatePoint() { u32 conds = save->GetLevelCondition(w, l); SpammyReport("Toad House Flags: %x", conds); - if (conds & 0xFF0) { + if (conds & 0x30) { nw4r::snd::SoundHandle something; PlaySoundWithFunctionB4(SoundRelatedClass, &something, SE_SYS_INVALID, 1); return; diff --git a/src/koopatlas/shop.cpp b/src/koopatlas/shop.cpp index b42c58a..514bd43 100644 --- a/src/koopatlas/shop.cpp +++ b/src/koopatlas/shop.cpp @@ -547,6 +547,11 @@ void dWMShop_c::buyItem(int item) { block->player_lives[i] = 99; } + // load the coin count + int scCount = getStarCoinCount(); + WriteNumberToTextBox(&scCount, CoinCount, false); + WriteNumberToTextBox(&scCount, CoinCountShadow, false); + state.setState(&StateID_HideWait); } |