From 10ebf4484985b98e9248c8de84b35af9b6e26d3a Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Wed, 22 Aug 2007 16:07:11 +0000 Subject: Fixed an arithmetic exception in ItemShortcutContainer::draw. Changed default sitting key back to 's'. Fixed a problem with all equipment being interpreted as weapon sprite. --- src/net/beinghandler.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/net/beinghandler.cpp') diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 3bec6369..c6e03c86 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -107,7 +107,8 @@ void BeingHandler::handleMessage(MessageIn *msg) dstBeing->setWalkSpeed(speed); dstBeing->mJob = job; dstBeing->setHairStyle(msg->readInt16()); - dstBeing->setVisibleEquipment(Being::WEAPON_SPRITE, msg->readInt16() * 10000); + dstBeing->setVisibleEquipment( + Being::WEAPON_SPRITE, msg->readInt16() * 10000); dstBeing->setVisibleEquipment( Being::BOTTOMCLOTHES_SPRITE, msg->readInt16()); @@ -117,9 +118,10 @@ void BeingHandler::handleMessage(MessageIn *msg) } msg->readInt16(); // shield - dstBeing->setVisibleEquipment(Being::HAT_SPRITE, msg->readInt16()); - dstBeing->setVisibleEquipment( - Being::TOPCLOTHES_SPRITE, msg->readInt16()); + headTop = msg->readInt16(); + headMid = msg->readInt16(); + dstBeing->setVisibleEquipment(Being::HAT_SPRITE, headTop); + dstBeing->setVisibleEquipment(Being::TOPCLOTHES_SPRITE, headMid); dstBeing->setHairColor(msg->readInt16()); msg->readInt16(); // unknown msg->readInt16(); // head dir @@ -224,10 +226,12 @@ void BeingHandler::handleMessage(MessageIn *msg) } Particle *levelupFX; if (msg->readInt32() == 0) { // type - levelupFX = particleEngine->addEffect("graphics/particles/levelup.particle.xml", 0, 0); + levelupFX = particleEngine->addEffect( + "graphics/particles/levelup.particle.xml", 0, 0); } else { - levelupFX = particleEngine->addEffect("graphics/particles/skillup.particle.xml", 0, 0); + levelupFX = particleEngine->addEffect( + "graphics/particles/skillup.particle.xml", 0, 0); } beingManager->findBeing(id)->controlParticle(levelupFX); break; -- cgit v1.2.3-70-g09d2