diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-03 02:50:03 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-03 02:50:03 +0200 |
| commit | de51eaa43e05c2126fc1eef2a7e115843f972547 (patch) | |
| tree | 286a05a069e048247f90c7595f1b8939be784608 /src/net/manaserv/beinghandler.cpp | |
| parent | d4c08d3bf69410a35a50875de50cc6fe74b3bf3e (diff) | |
| parent | 8627c7745f47492ab349da6a74e98e3d5813418f (diff) | |
| download | mv-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.gz mv-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.bz2 mv-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.xz mv-de51eaa43e05c2126fc1eef2a7e115843f972547.zip | |
Merge branch 'coloritems'
Diffstat (limited to 'src/net/manaserv/beinghandler.cpp')
| -rw-r--r-- | src/net/manaserv/beinghandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp index f5fa7d26c..b726bc52e 100644 --- a/src/net/manaserv/beinghandler.cpp +++ b/src/net/manaserv/beinghandler.cpp @@ -155,7 +155,7 @@ static void handleLooks(Being *being, Net::MessageIn &msg) { if (!(mask & (1 << i))) continue; int id = msg.readInt16(); - being->setSprite(slots[i], id, "", (slots[i] == SPRITE_WEAPON)); + being->setSprite(slots[i], id, "", 1, (slots[i] == SPRITE_WEAPON)); } } @@ -185,7 +185,7 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg) being->setName(name); } int hs = msg.readInt8(), hc = msg.readInt8(); - being->setSprite(SPRITE_HAIR, hs * -1, ColorDB::get(hc)); + being->setSprite(SPRITE_HAIR, hs * -1, ColorDB::getHairColor(hc)); being->setGender(msg.readInt8() == GENDER_MALE ? GENDER_MALE : GENDER_FEMALE); handleLooks(being, msg); @@ -350,7 +350,7 @@ void BeingHandler::handleBeingLooksChangeMessage(Net::MessageIn &msg) { int style = msg.readInt16(); int color = msg.readInt16(); - being->setSprite(SPRITE_HAIR, style * -1, ColorDB::get(color)); + being->setSprite(SPRITE_HAIR, style * -1, ColorDB::getHairColor(color)); } } |