diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2012-01-18 18:10:26 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2012-01-18 22:40:43 +0100 |
| commit | 4159ba015c5f2035d188367d85d85052a7673cdc (patch) | |
| tree | 1776e43ef3708dc094f747e64720dd41f1fa1f5b /src/net/tmwa | |
| parent | e554d9b2be1ec2fcb15065ae70151302adeef602 (diff) | |
| download | mana-4159ba015c5f2035d188367d85d85052a7673cdc.tar.gz mana-4159ba015c5f2035d188367d85d85052a7673cdc.tar.bz2 mana-4159ba015c5f2035d188367d85d85052a7673cdc.tar.xz mana-4159ba015c5f2035d188367d85d85052a7673cdc.zip | |
ColorDB -> HairDB.
This will ease the reading of the next patch about hair handling
at character creation time in tAthena.
As requested by bjorn.
Reviewed-by: bjorn
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 8 | ||||
| -rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index e3e92a0b..f2ce7df8 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -35,7 +35,7 @@ #include "net/tmwa/protocol.h" -#include "resources/colordb.h" +#include "resources/hairdb.h" #include "resources/emotedb.h" #include <iostream> @@ -245,7 +245,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) dstBeing->setGender((gender == 0) ? GENDER_FEMALE : GENDER_MALE); // Set these after the gender, as the sprites may be gender-specific - dstBeing->setSprite(SPRITE_HAIR, hairStyle * -1, ColorDB::get(hairColor)); + dstBeing->setSprite(SPRITE_HAIR, hairStyle * -1, HairDB::get(hairColor)); dstBeing->setSprite(SPRITE_BOTTOMCLOTHES, headBottom); dstBeing->setSprite(SPRITE_TOPCLOTHES, headMid); dstBeing->setSprite(SPRITE_HAT, headTop); @@ -487,7 +487,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) dstBeing->setSprite(SPRITE_TOPCLOTHES, id); break; case 6: // eAthena LOOK_HAIR_COLOR - dstBeing->setSpriteColor(SPRITE_HAIR, ColorDB::get(id)); + dstBeing->setSpriteColor(SPRITE_HAIR, HairDB::get(id)); break; case 8: // eAthena LOOK_SHIELD dstBeing->setSprite(SPRITE_SHIELD, id); @@ -614,7 +614,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) //dstBeing->setSprite(SPRITE_CAPE, cape); //dstBeing->setSprite(SPRITE_MISC1, misc1); //dstBeing->setSprite(SPRITE_MISC2, misc2); - dstBeing->setSprite(SPRITE_HAIR, hairStyle * -1, ColorDB::get(hairColor)); + dstBeing->setSprite(SPRITE_HAIR, hairStyle * -1, HairDB::get(hairColor)); if (msg.getId() == SMSG_PLAYER_MOVE) { diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 83682efe..f90537ec 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -38,7 +38,7 @@ #include "net/tmwa/network.h" #include "net/tmwa/protocol.h" -#include "resources/colordb.h" +#include "resources/hairdb.h" #include "utils/dtor.h" #include "utils/gettext.h" @@ -240,7 +240,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, Net::Character *char tempPlayer->setSprite(SPRITE_SHIELD, msg.readInt16()); tempPlayer->setSprite(SPRITE_HAT, msg.readInt16()); // head option top tempPlayer->setSprite(SPRITE_TOPCLOTHES, msg.readInt16()); // head option mid - tempPlayer->setSprite(SPRITE_HAIR, hairStyle * -1, ColorDB::get(msg.readInt16())); + tempPlayer->setSprite(SPRITE_HAIR, hairStyle * -1, HairDB::get(msg.readInt16())); tempPlayer->setSprite(SPRITE_MISC2, msg.readInt16()); tempPlayer->setName(msg.readString(24)); |