From 270b231714d47afa5f3caa89f4ff2415d394c1fa Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 2 Jan 2015 17:09:48 +0300 Subject: Fix code style. --- src/game.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/game.cpp') 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) -- cgit v1.2.3-70-g09d2