diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/beinghandler.cpp | 10 | ||||
| -rw-r--r-- | src/player.cpp | 31 |
2 files changed, 25 insertions, 16 deletions
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 4fcf2105..67d04ee4 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -62,6 +62,7 @@ void BeingHandler::handleMessage(MessageIn *msg) { Uint32 id; Uint16 job, speed; + Uint16 headBottom, headTop, headMid; Sint16 param1; Sint8 type; Being *srcBeing, *dstBeing; @@ -315,15 +316,15 @@ void BeingHandler::handleMessage(MessageIn *msg) dstBeing->setHairStyle(msg->readInt16()); dstBeing->setWeaponById(msg->readInt16()); // item id 1 msg->readInt16(); // item id 2 - dstBeing->setVisibleEquipment(3, msg->readInt16()); // head bottom + headBottom = msg->readInt16(); if (msg->getId() == SMSG_PLAYER_MOVE) { msg->readInt32(); // server tick } - dstBeing->setVisibleEquipment(4, msg->readInt16()); // head top - dstBeing->setVisibleEquipment(5, msg->readInt16()); // head mid + headTop = msg->readInt16(); + headMid = msg->readInt16(); dstBeing->setHairColor(msg->readInt16()); msg->readInt16(); // unknown msg->readInt16(); // head dir @@ -332,6 +333,9 @@ void BeingHandler::handleMessage(MessageIn *msg) msg->readInt16(); // manner msg->readInt8(); // karma dstBeing->setSex(1 - msg->readInt8()); // sex + dstBeing->setVisibleEquipment(3, headBottom); + dstBeing->setVisibleEquipment(4, headTop); + dstBeing->setVisibleEquipment(5, headMid); if (msg->getId() == SMSG_PLAYER_MOVE) { diff --git a/src/player.cpp b/src/player.cpp index cd6986b3..533d88fa 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -89,28 +89,31 @@ Player::setSex(Uint8 sex) { if (sex != mSex) { - //reload base sprite - delete mSprites[BASE_SPRITE]; + // Reload base sprite + AnimatedSprite *newBaseSprite; if (sex == 0) { - mSprites[BASE_SPRITE] = new AnimatedSprite( + newBaseSprite = new AnimatedSprite( "graphics/sprites/player_male_base.xml"); } else { - mSprites[BASE_SPRITE] = new AnimatedSprite( + newBaseSprite = new AnimatedSprite( "graphics/sprites/player_female_base.xml"); } + delete mSprites[BASE_SPRITE]; + mSprites[BASE_SPRITE] = newBaseSprite; - //reload equipment + // Reload equipment for (int i=1; i<VECTOREND_SPRITE ; i++) { if (i != HAIR_SPRITE && mEquipmentSpriteIDs.at(i) != 0) { - delete mSprites[i]; - mSprites[i] = new AnimatedSprite( + AnimatedSprite *newEqSprite = new AnimatedSprite( "graphics/sprites/" + EquipmentDB::get( mEquipmentSpriteIDs.at(i))->getSprite(sex)); + delete mSprites[i]; + mSprites[i] = newEqSprite; } } } @@ -124,28 +127,30 @@ Player::setWeapon(Uint16 weapon) { if (weapon != mWeapon) { - delete mSprites[WEAPON_SPRITE]; - mSprites[WEAPON_SPRITE] = NULL; + AnimatedSprite *newWeaponSprite = NULL; switch (weapon) { case 0: - mSprites[WEAPON_SPRITE] = + newWeaponSprite = new AnimatedSprite("graphics/sprites/weapon-fist.xml"); break; case 1: - mSprites[WEAPON_SPRITE] = + newWeaponSprite = new AnimatedSprite("graphics/sprites/weapon-dagger.xml"); break; case 2: - mSprites[WEAPON_SPRITE] = + newWeaponSprite = new AnimatedSprite("graphics/sprites/weapon-bow.xml"); break; case 3: - mSprites[WEAPON_SPRITE] = + newWeaponSprite = new AnimatedSprite("graphics/sprites/weapon-scythe.xml"); break; } + + delete mSprites[WEAPON_SPRITE]; + mSprites[WEAPON_SPRITE] = newWeaponSprite; } Being::setWeapon(weapon); } |