From 3d524b386e3dd6d89d481749cd0015bff247a703 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 21 Jun 2016 15:09:39 +0300 Subject: In Being split setSpriteId into setSpriteId and unSetSprite. --- src/net/eathena/beinghandler.cpp | 45 +++++++++++++------------------------- src/net/eathena/charserverrecv.cpp | 3 +-- src/net/tmwa/beinghandler.cpp | 15 +++++-------- src/net/tmwa/charserverrecv.cpp | 3 +-- 4 files changed, 22 insertions(+), 44 deletions(-) (limited to 'src/net') diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index dbf797e2b..418876b0d 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -50,36 +50,21 @@ void BeingHandler::undress(Being *const being) const { if (!being) return; - being->setSpriteId(SPRITE_WEAPON, - 0); - being->setSpriteId(SPRITE_HEAD_BOTTOM, - 0); - being->setSpriteId(SPRITE_HEAD_TOP, - 0); - being->setSpriteId(SPRITE_HEAD_MID, - 0); - being->setSpriteId(SPRITE_CLOTHES_COLOR, - 0); - being->setSpriteId(SPRITE_SHIELD, - 0); - being->setSpriteId(SPRITE_FLOOR, - 0); - being->setSpriteId(SPRITE_ROBE, - 0); - being->setSpriteId(SPRITE_EVOL2, - 0); - being->setSpriteId(SPRITE_EVOL3, - 0); - being->setSpriteId(SPRITE_EVOL4, - 0); - being->setSpriteId(SPRITE_EVOL5, - 0); - being->setSpriteId(SPRITE_EVOL6, - 0); - being->setSpriteId(SPRITE_HAIR, - 0); - being->setSpriteId(SPRITE_SHOES, - 0); + being->unSetSprite(SPRITE_WEAPON); + being->unSetSprite(SPRITE_HEAD_BOTTOM); + being->unSetSprite(SPRITE_HEAD_TOP); + being->unSetSprite(SPRITE_HEAD_MID); + being->unSetSprite(SPRITE_CLOTHES_COLOR); + being->unSetSprite(SPRITE_SHIELD); + being->unSetSprite(SPRITE_FLOOR); + being->unSetSprite(SPRITE_ROBE); + being->unSetSprite(SPRITE_EVOL2); + being->unSetSprite(SPRITE_EVOL3); + being->unSetSprite(SPRITE_EVOL4); + being->unSetSprite(SPRITE_EVOL5); + being->unSetSprite(SPRITE_EVOL6); + being->unSetSprite(SPRITE_HAIR); + being->unSetSprite(SPRITE_SHOES); } void BeingHandler::requestRanks(const RankT rank) const diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp index 555a876be..3ddb6af95 100644 --- a/src/net/eathena/charserverrecv.cpp +++ b/src/net/eathena/charserverrecv.cpp @@ -147,8 +147,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, tempPlayer->setHairColor(color); if (hairStyle == 0) { - tempPlayer->setSpriteId(SPRITE_HAIR_COLOR, - 0); + tempPlayer->unSetSprite(SPRITE_HAIR_COLOR); } else { diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 346aedf58..3629cf8a7 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -49,16 +49,11 @@ void BeingHandler::undress(Being *const being) const { if (!being) return; - being->setSpriteId(SPRITE_WEAPON, - 0); - being->setSpriteId(SPRITE_HEAD_BOTTOM, - 0); - being->setSpriteId(SPRITE_CLOTHES_COLOR, - 0); - being->setSpriteId(SPRITE_HAIR, - 0); - being->setSpriteId(SPRITE_SHOES, - 0); + being->unSetSprite(SPRITE_WEAPON); + being->unSetSprite(SPRITE_HEAD_BOTTOM); + being->unSetSprite(SPRITE_CLOTHES_COLOR); + being->unSetSprite(SPRITE_HAIR); + being->unSetSprite(SPRITE_SHOES); } #ifdef EATHENA_SUPPORT diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index 85f06159d..242e3e489 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -124,8 +124,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, msg.readUInt8("unused"); if (hairStyle == 0) { - tempPlayer->setSpriteId(SPRITE_HAIR_COLOR, - 0); + tempPlayer->unSetSprite(SPRITE_HAIR_COLOR); } else { -- cgit v1.2.3-60-g2f50