diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-25 13:11:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-25 13:11:29 +0300 |
| commit | b1d25bc45df987a7e55ede2a0529fc90986ad1c7 (patch) | |
| tree | 1a7f4c5974479e098fde13e37497f575925fdfbd /src | |
| parent | 22b5ab21f9354294def23a6205359d5763c30739 (diff) | |
| download | manaplus-b1d25bc45df987a7e55ede2a0529fc90986ad1c7.tar.gz manaplus-b1d25bc45df987a7e55ede2a0529fc90986ad1c7.tar.bz2 manaplus-b1d25bc45df987a7e55ede2a0529fc90986ad1c7.tar.xz manaplus-b1d25bc45df987a7e55ede2a0529fc90986ad1c7.zip | |
Fix homunculus name detection.
Diffstat (limited to 'src')
| -rw-r--r-- | src/being/playerinfo.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/homunculushandler.cpp | 17 |
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 |