diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-17 11:24:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-17 11:24:41 +0300 |
| commit | 4eaedf092bc504fae492827b1a89e7bbaac20263 (patch) | |
| tree | 098d1b1a7721606a8c053dc56f9e9765b8072c9e /src/actions | |
| parent | 418d749f0d4889904d0b91e825a87e70a08d134c (diff) | |
| download | manaplus-4eaedf092bc504fae492827b1a89e7bbaac20263.tar.gz manaplus-4eaedf092bc504fae492827b1a89e7bbaac20263.tar.bz2 manaplus-4eaedf092bc504fae492827b1a89e7bbaac20263.tar.xz manaplus-4eaedf092bc504fae492827b1a89e7bbaac20263.zip | |
Remove getter for petHandler.
Diffstat (limited to 'src/actions')
| -rw-r--r-- | src/actions/actions.cpp | 4 | ||||
| -rw-r--r-- | src/actions/commands.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 5fd3b6e70..6c8c49ca6 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -179,7 +179,7 @@ impHandler(petEmote) { const int emotion = event.action - InputAction::PET_EMOTE_1; if (emoteShortcut) - Net::getPetHandler()->emote(emoteShortcut->getEmote(emotion), 0); + petHandler->emote(emoteShortcut->getEmote(emotion), 0); if (Game::instance()) Game::instance()->setValidSpeed(); return true; @@ -1170,7 +1170,7 @@ impHandler(catchPet) else localPlayer->setTarget(target); if (target) - Net::getPetHandler()->catchPet(target); + petHandler->catchPet(target); return true; } diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index d5c2f5096..cdc65f0ad 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -318,7 +318,7 @@ impHandler(commandEmote) impHandler(commandEmotePet) { // need use actual pet id - Net::getPetHandler()->emote(static_cast<uint8_t>( + petHandler->emote(static_cast<uint8_t>( atoi(event.args.c_str())), 0); return true; } |