diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-08 14:30:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-08 14:30:28 +0300 |
| commit | c9a31afec60a5085e0a3dbd26c15db397730a768 (patch) | |
| tree | 08fe6126f1c1405a62be00425601613f19841601 /src/net/tmwa/beingrecv.cpp | |
| parent | c43a3b024bf3da2b0c7b6eb177b662d63db41808 (diff) | |
| download | plus-c9a31afec60a5085e0a3dbd26c15db397730a768.tar.gz plus-c9a31afec60a5085e0a3dbd26c15db397730a768.tar.bz2 plus-c9a31afec60a5085e0a3dbd26c15db397730a768.tar.xz plus-c9a31afec60a5085e0a3dbd26c15db397730a768.zip | |
Add strong typed bool IsWeapon.
Diffstat (limited to 'src/net/tmwa/beingrecv.cpp')
| -rw-r--r-- | src/net/tmwa/beingrecv.cpp | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index cb5eefd92..5eec60985 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -143,7 +143,11 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, break; } case 2: // Weapon ID in id, Shield ID in id2 - dstBeing->setSprite(SPRITE_BODY, id, "", ItemColor_one, true); + dstBeing->setSprite(SPRITE_BODY, + id, + "", + ItemColor_one, + IsWeapon_true); dstBeing->setSprite(SPRITE_FLOOR, id2); localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; @@ -311,7 +315,11 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg) if (!disguiseId) { // Set these after the gender, as the sprites may be gender-specific - dstBeing->updateSprite(SPRITE_BODY, weapon, "", ItemColor_one, true); + dstBeing->updateSprite(SPRITE_BODY, + weapon, + "", + ItemColor_one, + IsWeapon_true); dstBeing->updateSprite(SPRITE_FLOOR, shield); dstBeing->updateSprite(SPRITE_WEAPON, headBottom); dstBeing->updateSprite(SPRITE_HEAD_BOTTOM, headMid); @@ -453,7 +461,11 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg) if (!disguiseId) { // Set these after the gender, as the sprites may be gender-specific - dstBeing->updateSprite(SPRITE_BODY, weapon, "", ItemColor_one, true); + dstBeing->updateSprite(SPRITE_BODY, + weapon, + "", + ItemColor_one, + IsWeapon_true); dstBeing->updateSprite(SPRITE_FLOOR, shield); dstBeing->updateSprite(SPRITE_WEAPON, headBottom); dstBeing->updateSprite(SPRITE_HEAD_BOTTOM, headMid); @@ -595,7 +607,11 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg) if (!disguiseId) { // Set these after the gender, as the sprites may be gender-specific - dstBeing->updateSprite(SPRITE_BODY, weapon, "", ItemColor_one, true); + dstBeing->updateSprite(SPRITE_BODY, + weapon, + "", + ItemColor_one, + IsWeapon_true); dstBeing->updateSprite(SPRITE_FLOOR, shield); dstBeing->updateSprite(SPRITE_WEAPON, headBottom); dstBeing->updateSprite(SPRITE_HEAD_BOTTOM, headMid); @@ -844,8 +860,12 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg) Ea::BeingRecv::setSprite(dstBeing, SPRITE_CLOTHES_COLOR, headTop); Ea::BeingRecv::setSprite(dstBeing, SPRITE_HAIR, shoes); Ea::BeingRecv::setSprite(dstBeing, SPRITE_SHOES, gloves); - Ea::BeingRecv::setSprite(dstBeing, SPRITE_BODY, weapon, "", - ItemColor_one, true); + Ea::BeingRecv::setSprite(dstBeing, + SPRITE_BODY, + weapon, + "", + ItemColor_one, + IsWeapon_true); Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield); } else if (dstBeing->getType() == ActorType::Npc @@ -1057,8 +1077,12 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg) Ea::BeingRecv::setSprite(dstBeing, SPRITE_CLOTHES_COLOR, headTop); Ea::BeingRecv::setSprite(dstBeing, SPRITE_HAIR, shoes); Ea::BeingRecv::setSprite(dstBeing, SPRITE_SHOES, gloves); - Ea::BeingRecv::setSprite(dstBeing, SPRITE_BODY, weapon, "", - ItemColor_one, true); + Ea::BeingRecv::setSprite(dstBeing, + SPRITE_BODY, + weapon, + "", + ItemColor_one, + IsWeapon_true); Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield); } else if (dstBeing->getType() == ActorType::Npc |