summaryrefslogtreecommitdiff
path: root/src/koopatlas/core.cpp
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-10-06 16:17:09 +0200
committerTreeki <treeki@gmail.com>2012-10-06 16:17:09 +0200
commit14f6cc96178c0324833a9ec3097263d35a67e181 (patch)
tree80e532efb8da84f8e22d4dbe0a1fb6797376aa93 /src/koopatlas/core.cpp
parent4fd3cfc8dc1215ae6f3bcea43a2dc23acebc6e51 (diff)
downloadkamek-14f6cc96178c0324833a9ec3097263d35a67e181.tar.gz
kamek-14f6cc96178c0324833a9ec3097263d35a67e181.zip
fixed some shit thing
Diffstat (limited to '')
-rw-r--r--src/koopatlas/core.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index a48a565..c1f7a43 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -479,10 +479,10 @@ void dScKoopatlas_c::executeState_Normal() {
int nowPressed = Remocon_GetPressed(GetActiveRemocon());
// Nothing related to the menu is going on
- if (nowPressed & WPAD_ONE) {
+ if (nowPressed & WPAD_ONE && !pathManager.isEnteringLevel) {
STKI_SHOW(this->stockItem) = true;
state.setState(&StateID_PowerupsWait);
- } else if (nowPressed & WPAD_PLUS) {
+ } else if (nowPressed & WPAD_PLUS && !pathManager.isEnteringLevel) {
CSMENU_ACTIVE(this->csMenu) = true;
state.setState(&StateID_CSMenu);
// } else if (nowPressed & WPAD_A) {