summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-09-07 05:34:19 +0000
committerIra Rice <irarice@gmail.com>2008-09-07 05:34:19 +0000
commit56b48b23124ca351269978720ab72bc366eef425 (patch)
tree45511fd224ff91109f757a83ef3694073ef9c7cb /src
parentc57fdaf3c18f34678cf4753a1fae0e6d622839a7 (diff)
downloadmana-56b48b23124ca351269978720ab72bc366eef425.tar.gz
mana-56b48b23124ca351269978720ab72bc366eef425.tar.bz2
mana-56b48b23124ca351269978720ab72bc366eef425.tar.xz
mana-56b48b23124ca351269978720ab72bc366eef425.zip
Added 6 colors for each of the hair styles. Since 10 is an odd number
for the number of colors for a packet, I added 6 more fun colors. I'd add in two more hair styles as well, but since I don't know if it's safe, I'm going to play it safe for now and not include them.
Diffstat (limited to 'src')
-rw-r--r--src/being.h2
-rw-r--r--src/player.cpp10
2 files changed, 9 insertions, 3 deletions
diff --git a/src/being.h b/src/being.h
index 7f68c8c3..e6cfd479 100644
--- a/src/being.h
+++ b/src/being.h
@@ -35,7 +35,7 @@
#include "animatedsprite.h"
#define NR_HAIR_STYLES 8
-#define NR_HAIR_COLORS 10
+#define NR_HAIR_COLORS 16
#define FIRST_IGNORE_EMOTE 14
diff --git a/src/player.cpp b/src/player.cpp
index 0740c7db..125407de 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -157,14 +157,20 @@ void Player::setHairStyle(int style, int color)
{
"#8c4b41,da9041,ffffff", // light brown
"#06372b,489e25,fdedcc", // green
- "#5f0b33,91191c,f9ad81", // red
+ "#5f0b33,91191c,f9ad81", // dark red
"#602486,934cc3,fdc689", // purple
- "#805e74,c6b09b,ffffff", // gray
+ "#805e74,c6b09b,ffffff", // white
"#8c6625,dab425,ffffff", // yellow
"#1d2d6d,1594a3,fdedcc", // blue
"#831f2d,be4f2d,f8cc8b", // brown
"#432482,584bbc,dae8e5", // light blue
"#460850,611967,e7b4ae", // dark purple
+ "#8f3e21,bc522b,ff946c", // orange
+ "#9c6b84,d272a3,ffcae5", // pink
+ "#1d1d1d,414141,6f6f6f", // charcoal
+ "#525252,99999b,cacaca", // silver
+ "#841413,aa2829,ffaeb1", // light red
+ "#a82513,ffa525,ffffff", // strawberry blond
};
setSprite(HAIR_SPRITE, style * -1, colors[color]);