summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2012-01-18 19:20:34 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2012-02-02 15:31:41 +0100
commitf5de9ae444f1bca1f6ba6969214e9a8cacb15f68 (patch)
treef9b9c699c52d279cdc4d93b09f48dd3b24403f5b /src/client.cpp
parent7cc504d993fa948ae2e10848993f4552b2d6daaa (diff)
downloadmana-f5de9ae444f1bca1f6ba6969214e9a8cacb15f68.tar.gz
mana-f5de9ae444f1bca1f6ba6969214e9a8cacb15f68.tar.bz2
mana-f5de9ae444f1bca1f6ba6969214e9a8cacb15f68.tar.xz
mana-f5de9ae444f1bca1f6ba6969214e9a8cacb15f68.zip
Fix to the hair colors and styles handling.
- I made the charCreatedialog handle a possible max permitted color Id and a minimum hair style id for tA. - Added a foundation to later load the styles and colors from the same file, to handle the Mana-issue #224 for manaserv. - Support for non-contiguous hair color and style ids has also been added. - I also replaced the < and > arrow signs with images. Reviewed-by: Ben Longbons, Thorbjørn Lindeijer
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 1fa36d48..d50257f2 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -119,7 +119,8 @@ KeyboardConfig keyboard;
UserPalette *userPalette;
Graphics *graphics;
-ItemDB *itemDb;
+ItemDB *itemDb; /**< Items info database */
+HairDB hairDB; /**< Hair styles and colors info database */
Sound sound;
@@ -452,7 +453,7 @@ Client::~Client()
SDL_RemoveTimer(mSecondsCounterId);
// Unload XML databases
- HairDB::unload();
+ hairDB.unload();
EmoteDB::unload();
delete itemDb;
MonsterDB::unload();
@@ -761,7 +762,7 @@ int Client::exec()
Event::trigger(Event::ClientChannel, Event::LoadingDatabases);
// Load XML databases
- HairDB::load();
+ hairDB.load();
switch (Net::getNetworkType())
{
case ServerInfo::TMWATHENA:
@@ -786,7 +787,6 @@ int Client::exec()
STATE_CHOOSE_SERVER);
break;
}
- Being::load(); // Hairstyles
MonsterDB::load();
SpecialDB::load();
NPCDB::load();