diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 13 | ||||
| -rw-r--r-- | src/net/tmwa/specialhandler.cpp | 7 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 6875a067e..2da19ad36 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -82,15 +82,10 @@ Being *BeingHandler::createBeing(int id, short job) if (type == ActorSprite::PLAYER || type == ActorSprite::NPC) { - if (!being->updateFromCache()) - { - requestNameById(id); - } - else - { - if (player_node) - player_node->checkNewName(being); - } + being->updateFromCache(); + requestNameById(id); + if (player_node) + player_node->checkNewName(being); } if (type == Being::PLAYER) { diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp index 19713a0bf..1e6249a51 100644 --- a/src/net/tmwa/specialhandler.cpp +++ b/src/net/tmwa/specialhandler.cpp @@ -23,6 +23,7 @@ #include "net/tmwa/specialhandler.h" #include "log.h" +#include "localplayer.h" #include "playerinfo.h" #include "gui/skilldialog.h" @@ -152,6 +153,12 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg) std::string msg; if (success == SKILL_FAILED && skillId == SKILL_BASIC) { + if (player_node && bskill == BSKILL_EMOTE + && reason == RFAIL_SKILLDEP) + { + player_node->stopAdvert(); + } + switch (bskill) { case BSKILL_TRADE: |