diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-12-13 23:48:19 -0600 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-12-13 23:48:19 -0600 |
| commit | dc914f134411f829c49f0dfb5c11255e9caccf2e (patch) | |
| tree | 531d6931e86c2ab2490c7bb61da559d11a5a5365 /src | |
| parent | aba4844daf75a1301586a40f2842c5e981d8b402 (diff) | |
| parent | 77d84453e28d176c78bd789bd6e8888874ac5bf4 (diff) | |
| download | kamek-dc914f134411f829c49f0dfb5c11255e9caccf2e.tar.gz kamek-dc914f134411f829c49f0dfb5c11255e9caccf2e.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to 'src')
| -rw-r--r-- | src/koopatlas/pathmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp index 109f791..6cff759 100644 --- a/src/koopatlas/pathmanager.cpp +++ b/src/koopatlas/pathmanager.cpp @@ -338,7 +338,7 @@ bool dWMPathManager_c::evaluateUnlockCondition(u8 *&in, SaveBlock *save, int sta bool dWMPathManager_c::doingThings() { if (isEnteringLevel || (waitAfterUnlock > 0) || (waitAtStart > 0) || (waitForAfterDeathAnim > 0) || - (countdownToFadeIn > 0)) + (countdownToFadeIn > 0) || (unlockingAlpha != -1)) return true; if (isMoving) |