summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-25 13:11:29 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-25 13:11:29 +0300
commitb1d25bc45df987a7e55ede2a0529fc90986ad1c7 (patch)
tree1a7f4c5974479e098fde13e37497f575925fdfbd /src
parent22b5ab21f9354294def23a6205359d5763c30739 (diff)
downloadplus-b1d25bc45df987a7e55ede2a0529fc90986ad1c7.tar.gz
plus-b1d25bc45df987a7e55ede2a0529fc90986ad1c7.tar.bz2
plus-b1d25bc45df987a7e55ede2a0529fc90986ad1c7.tar.xz
plus-b1d25bc45df987a7e55ede2a0529fc90986ad1c7.zip
Fix homunculus name detection.
Diffstat (limited to 'src')
-rw-r--r--src/being/playerinfo.cpp2
-rw-r--r--src/net/eathena/homunculushandler.cpp17
2 files changed, 8 insertions, 11 deletions
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index 4f40b2c58..d4654c7be 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -522,7 +522,7 @@ void setHomunculus(HomunculusInfo *const info)
void setHomunculusBeing(Being *const being)
{
- if (!being || !mPet)
+ if (!being || !mHomunculus)
return;
being->setName(mHomunculus->name);
being->setOwner(localPlayer);
diff --git a/src/net/eathena/homunculushandler.cpp b/src/net/eathena/homunculushandler.cpp
index 36f634de0..8030bf4bb 100644
--- a/src/net/eathena/homunculushandler.cpp
+++ b/src/net/eathena/homunculushandler.cpp
@@ -170,16 +170,13 @@ void HomunculusHandler::processHomunculusInfo(Net::MessageIn &msg)
return;
Being *const dstBeing = actorManager->findBeing(info->id);
- if (dstBeing)
- {
- info->name = name;
- info->level = level;
- info->range = range;
- info->hungry = hungry;
- info->intimacy = intimacy;
- info->equip = equip;
- PlayerInfo::setHomunculusBeing(dstBeing);
- }
+ info->name = name;
+ info->level = level;
+ info->range = range;
+ info->hungry = hungry;
+ info->intimacy = intimacy;
+ info->equip = equip;
+ PlayerInfo::setHomunculusBeing(dstBeing);
}
} // namespace EAthena