diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-02 17:09:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-02 17:09:48 +0300 |
| commit | 270b231714d47afa5f3caa89f4ff2415d394c1fa (patch) | |
| tree | 6149aef26922d5071e0ab9d7f036387d29b6c13b /src/game.cpp | |
| parent | 38bed185876ab4e639412392005c0fe01e05d4f2 (diff) | |
| download | mv-270b231714d47afa5f3caa89f4ff2415d394c1fa.tar.gz mv-270b231714d47afa5f3caa89f4ff2415d394c1fa.tar.bz2 mv-270b231714d47afa5f3caa89f4ff2415d394c1fa.tar.xz mv-270b231714d47afa5f3caa89f4ff2415d394c1fa.zip | |
Fix code style.
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp index 8b85ac5ab..18615fa69 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -870,7 +870,7 @@ void Game::handleMove() localPlayer->cancelFollow(); } - if ((!inputManager.isActionActive(InputAction::EMOTE) + if ((!inputManager.isActionActive(InputAction::EMOTE) && !inputManager.isActionActive(InputAction::PET_EMOTE) && !inputManager.isActionActive(InputAction::STOP_ATTACK)) || direction == 0) |