diff options
| author | Treeki <treeki@gmail.com> | 2012-09-22 05:00:31 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-09-22 05:00:31 +0200 |
| commit | 69e333ae495048f991495b86faa7c7c137a92078 (patch) | |
| tree | a98565ec0bee67e0db2e819cb90b4ec74e4bdc93 /src/koopatlas/core.cpp | |
| parent | 955831a5bad45d39dfceb4a1741095b5d109b079 (diff) | |
| parent | 2d516c7c77158eb2125ff4f53d5051762df5959d (diff) | |
| download | kamek-69e333ae495048f991495b86faa7c7c137a92078.tar.gz kamek-69e333ae495048f991495b86faa7c7c137a92078.zip | |
Merge branch 'level-select' into new-hud
Diffstat (limited to 'src/koopatlas/core.cpp')
| -rw-r--r-- | src/koopatlas/core.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp index 7435103..164ea89 100644 --- a/src/koopatlas/core.cpp +++ b/src/koopatlas/core.cpp @@ -429,6 +429,13 @@ bool dScKoopatlas_c::canDoStuff() { return true; } +bool dScKoopatlas_c::mapIsRunning() { + if (QueryGlobal5758(0xFFFFFFFF)) return false; + if (CheckIfWeCantDoStuff()) return false; + if (state.getCurrentState() != &StateID_Normal) return false; + return true; +} + int dScKoopatlas_c::onExecute() { if (!canDoStuff()) return true; @@ -503,8 +510,6 @@ void dScKoopatlas_c::executeState_Normal() { } else if (nowPressed & WPAD_A) { pathManager.unlockAllPaths(0); } - - pathManager.execute(); } void dScKoopatlas_c::executeState_CSMenu() { |