From e57f4ec64f53091dd254c2ee2db9592d30a5af0b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 19 Oct 2008 23:07:35 +0000
Subject: Fixed a small error that I didn't notice before with de-hardcoding
 the colors. Thanks goes to paks for noticing this.

---
 src/being.cpp             | 3 ---
 src/gui/char_select.cpp   | 3 +++
 src/player.cpp            | 1 +
 src/resources/colordb.cpp | 2 +-
 src/resources/colordb.h   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index f05652f3..07c0716d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -478,10 +478,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
         mSpeechBubble->setVisible(false);
         // don't introduce a memory leak
         if (mText)
-        {
             delete mText;
-            mText = 0;
-        }
 
         mText = new Text(mSpeech, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET,
                          gcn::Graphics::CENTER, speechFont,
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 65d0159f..628ab35f 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -257,8 +257,11 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
     mPlayer = new Player(0, 0, NULL);
     mPlayer->setGender(gender);
 
+    ColorDB::load();
     int numberOfHairColors = ColorDB::size();
 
+    printf("%d\n", numberOfHairColors);
+
     mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % numberOfHairColors);
 
     mNameField = new TextField("");
diff --git a/src/player.cpp b/src/player.cpp
index 37badcdc..4025f8f4 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -44,6 +44,7 @@ Player::Player(int id, int job, Map *map):
 {
     mName = 0;
     mIsGM = false;
+    ColorDB::load();
 }
 
 Player::~Player()
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 837561ed..f738b471 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -113,7 +113,7 @@ std::string& ColorDB::get(int id)
     }
 }
 
-const int& ColorDB::size()
+int ColorDB::size()
 {
     return mColors.size();
 }
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 43398af4..1f8b191c 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -42,7 +42,7 @@ namespace ColorDB
 
     std::string& get(int id);
 
-    const int& size();
+    int size();
 
     // Color DB
     typedef std::map<int, std::string> Colors;
-- 
cgit v1.2.3-70-g09d2