diff options
author | Andrei Karas <akaras@inbox.ru> | 2020-02-23 09:30:51 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2020-02-23 09:30:51 +0300 |
commit | 1e2a88e975019929c4c7e3154537865cc09550a6 (patch) | |
tree | ae8bc68ad3a3f6b61a5e2d511d7fc17daa22bd0e /src/progs/manaplus/actions | |
parent | 6941fd4eeb1dce20aba8c42fd030c2690c37b731 (diff) | |
download | mv-1e2a88e975019929c4c7e3154537865cc09550a6.tar.gz mv-1e2a88e975019929c4c7e3154537865cc09550a6.tar.bz2 mv-1e2a88e975019929c4c7e3154537865cc09550a6.tar.xz mv-1e2a88e975019929c4c7e3154537865cc09550a6.zip |
Fix some code style issues
Diffstat (limited to 'src/progs/manaplus/actions')
-rw-r--r-- | src/progs/manaplus/actions/actions.cpp | 4 | ||||
-rw-r--r-- | src/progs/manaplus/actions/commands.cpp | 4 | ||||
-rw-r--r-- | src/progs/manaplus/actions/pets.cpp | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp index 1a351d268..4606137f3 100644 --- a/src/progs/manaplus/actions/actions.cpp +++ b/src/progs/manaplus/actions/actions.cpp @@ -1274,9 +1274,11 @@ impHandler(undress) if (sz == 2) { - const int itemId = atoi(pars[1].c_str()); if (target != nullptr) + { + const int itemId = atoi(pars[1].c_str()); target->undressItemById(itemId); + } } else { diff --git a/src/progs/manaplus/actions/commands.cpp b/src/progs/manaplus/actions/commands.cpp index dd58c221b..711816eac 100644 --- a/src/progs/manaplus/actions/commands.cpp +++ b/src/progs/manaplus/actions/commands.cpp @@ -1036,9 +1036,11 @@ impHandler(homunEmote) event.action >= InputAction::HOMUN_EMOTE_1 && event.action <= InputAction::HOMUN_EMOTE_48) { - const int emotion = event.action - InputAction::HOMUN_EMOTE_1; if (emoteShortcut != nullptr) + { + const int emotion = event.action - InputAction::HOMUN_EMOTE_1; homunculusHandler->emote(emoteShortcut->getEmote(emotion)); + } if (Game::instance() != nullptr) Game::instance()->setValidSpeed(); return true; diff --git a/src/progs/manaplus/actions/pets.cpp b/src/progs/manaplus/actions/pets.cpp index bb8ec4591..fd8c959f8 100644 --- a/src/progs/manaplus/actions/pets.cpp +++ b/src/progs/manaplus/actions/pets.cpp @@ -102,9 +102,11 @@ impHandler(petEmote) if (event.action >= InputAction::PET_EMOTE_1 && event.action <= InputAction::PET_EMOTE_48) { - const int emotion = event.action - InputAction::PET_EMOTE_1; if (emoteShortcut != nullptr) + { + const int emotion = event.action - InputAction::PET_EMOTE_1; petHandler->emote(emoteShortcut->getEmote(emotion)); + } if (Game::instance() != nullptr) Game::instance()->setValidSpeed(); return true; |