diff options
| author | Treeki <treeki@gmail.com> | 2013-04-08 00:25:30 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-04-08 00:34:35 +0200 |
| commit | 6829b6540ff8438d07908b603e069ee7711ee474 (patch) | |
| tree | b8d3f5836c298d5104625c395563b7b13fe99ad0 /src/koopatlas | |
| parent | 0d5478d02849aa54b4f8214c6209c390a78979fa (diff) | |
| download | kamek-6829b6540ff8438d07908b603e069ee7711ee474.tar.gz kamek-6829b6540ff8438d07908b603e069ee7711ee474.zip | |
shop fixes: animation speeds, deactivate during opening animation
Diffstat (limited to 'src/koopatlas')
| -rw-r--r-- | src/koopatlas/shop.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/koopatlas/shop.cpp b/src/koopatlas/shop.cpp index c8bbdca..80d2dd6 100644 --- a/src/koopatlas/shop.cpp +++ b/src/koopatlas/shop.cpp @@ -235,9 +235,6 @@ int dWMShop_c::onExecute() { state.execute(); if (visible) { - layout.execAnimations(); - layout.update(); - lakituModel->execute(); for (int i = 0; i < 12; i++) @@ -326,6 +323,7 @@ void dWMShop_c::executeState_Wait() { if (timer < 90) { scaleEase = -((cos(timer * 3.14 /20)-0.9)/timer*10)+1; timer++; + return; } int nowPressed = Remocon_GetPressed(GetActiveRemocon()); @@ -395,8 +393,8 @@ void dWMShop_c::beginState_HideWait() { } void dWMShop_c::executeState_HideWait() { if (timer > 0) { - scaleEase = -((cos(timer * 3.14 /13.5)-0.9)/timer*10)+1; timer--; + scaleEase = -((cos(timer * 3.14 /13.5)-0.9)/timer*10)+1; } if (!layout.isAnimOn(HIDE_ALL)) |