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/player.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/player.cpp')
| -rw-r--r-- | src/koopatlas/player.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/koopatlas/player.cpp b/src/koopatlas/player.cpp index 51470da..ebd0124 100644 --- a/src/koopatlas/player.cpp +++ b/src/koopatlas/player.cpp @@ -38,6 +38,11 @@ int daWMPlayer_c::onDelete() { int daWMPlayer_c::onExecute() { + if (!dScKoopatlas_c::instance->mapIsRunning()) + return true; + + dScKoopatlas_c::instance->pathManager.execute(); + this->modelHandler->update(); Vec modifiedPos = {pos.x, pos.y + jumpOffset, pos.z}; this->modelHandler->setSRT(modifiedPos, this->rot, this->scale); |