diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2013-04-29 11:14:58 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2013-04-29 11:14:58 -0500 |
| commit | b025a888a429f63d6fb9e793520afc564cfdbcb3 (patch) | |
| tree | 0817c1fba513a13a417932ef7097b5f7c621d2b5 /src | |
| parent | 80901c98337c928fa7f88c34897f227df65f1257 (diff) | |
| download | kamek-b025a888a429f63d6fb9e793520afc564cfdbcb3.tar.gz kamek-b025a888a429f63d6fb9e793520afc564cfdbcb3.zip | |
Minor fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/bonusRoom.cpp | 4 | ||||
| -rw-r--r-- | src/koopatlas/core.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bonusRoom.cpp b/src/bonusRoom.cpp index 61bea87..290dfdd 100644 --- a/src/bonusRoom.cpp +++ b/src/bonusRoom.cpp @@ -813,7 +813,7 @@ void dSingAlong::executeState_Mistake() { PrizeModel->Delete(1); } - if (chorus == 3 && timer == 15) { + if (chorus >= 4 && timer == 15) { state.setState(&StateID_Failure); return; } @@ -836,7 +836,7 @@ void dSingAlong::executeState_Mistake() { } void dSingAlong::endState_Mistake() { - if (chorus != 3) { + if (chorus != 4) { SBa->isDead = 0; SBb->isDead = 0; SBc->isDead = 0; diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp index 1b2db0d..79cc3d2 100644 --- a/src/koopatlas/core.cpp +++ b/src/koopatlas/core.cpp @@ -538,7 +538,7 @@ void dScKoopatlas_c::executeState_Normal() { CSMENU_ACTIVE(this->csMenu) = true; state.setState(&StateID_CSMenu); hud->hideAll(); -#ifdef NEWER_DEBUG +// #ifdef NEWER_DEBUG } else if (nowPressed & WPAD_MINUS) { pathManager.unlockAllPaths(2); } else if (nowPressed & WPAD_A) { @@ -547,7 +547,7 @@ void dScKoopatlas_c::executeState_Normal() { for (int w = 0; w < 6; w++) for (int l = 0; l < 6; l++) save->SetLevelCondition(w, l, COND_COIN_ALL); -#endif +// #endif } } |