summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/manaserv/beinghandler.cpp6
-rw-r--r--src/net/manaserv/charhandler.cpp4
-rw-r--r--src/net/tmwa/beinghandler.cpp8
-rw-r--r--src/net/tmwa/charserverhandler.cpp4
4 files changed, 11 insertions, 11 deletions
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index 3e635d43..980c538c 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -38,7 +38,7 @@
#include "net/manaserv/playerhandler.h"
#include "net/manaserv/manaserv_protocol.h"
-#include "resources/colordb.h"
+#include "resources/hairdb.h"
#include "utils/gettext.h"
@@ -144,7 +144,7 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg)
being->setName(name);
}
int hs = msg.readInt8(), hc = msg.readInt8();
- being->setSprite(SPRITE_LAYER_HAIR, hs * -1, ColorDB::get(hc));
+ being->setSprite(SPRITE_LAYER_HAIR, hs * -1, HairDB::get(hc));
being->setGender(msg.readInt8() == ManaServ::GENDER_MALE ?
::GENDER_MALE : ::GENDER_FEMALE);
handleLooks(being, msg);
@@ -334,7 +334,7 @@ void BeingHandler::handleBeingLooksChangeMessage(Net::MessageIn &msg)
{
int style = msg.readInt16();
int color = msg.readInt16();
- being->setSprite(SPRITE_LAYER_HAIR, style * -1, ColorDB::get(color));
+ being->setSprite(SPRITE_LAYER_HAIR, style * -1, HairDB::get(color));
}
}
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index 8a072d26..a36ae1da 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -41,7 +41,7 @@
#include "net/manaserv/manaserv_protocol.h"
#include "net/manaserv/attributes.h"
-#include "resources/colordb.h"
+#include "resources/hairdb.h"
#include "utils/dtor.h"
#include "utils/gettext.h"
@@ -392,7 +392,7 @@ void CharHandler::updateCharacters()
player->setName(info.name);
player->setGender(info.gender);
player->setSprite(SPRITE_LAYER_HAIR, info.hairStyle * -1,
- ColorDB::get(info.hairColor));
+ HairDB::get(info.hairColor));
character->data.mAttributes[LEVEL] = info.level;
character->data.mAttributes[CHAR_POINTS] = info.characterPoints;
character->data.mAttributes[CORR_POINTS] = info.correctionPoints;
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));