mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r8892) -Fix (r8879): swapped the eye colour and eyebrow bits.

This commit is contained in:
rubidium 2007-02-25 09:06:13 +00:00
parent 4c4b035175
commit 9c6957b457
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/players.cpp
View File

@ -81,11 +81,11 @@ DECLARE_ENUM_AS_BIT_SET(GenderRace); ///< See GenderRace as a bitset
* *
* Meaning of the bits in face (some bits are used in several times): * Meaning of the bits in face (some bits are used in several times):
* - 4 and 5: chin * - 4 and 5: chin
* - 6 to 9: eye colour * - 6 to 9: eyebrows
* - 10 to 13: nose * - 10 to 13: nose
* - 13 to 15: lips (also moustache for males) * - 13 to 15: lips (also moustache for males)
* - 16 to 19: hair * - 16 to 19: hair
* - 20 to 22: eyebrows * - 20 to 22: eye color
* - 20 to 27: tie, ear rings etc. * - 20 to 27: tie, ear rings etc.
* - 28 to 30: glasses * - 28 to 30: glasses
* - 19, 26 and 27: race (bit 27 set and bit 19 equal to bit 26 = black, otherwise white) * - 19, 26 and 27: race (bit 27 set and bit 19 equal to bit 26 = black, otherwise white)
@ -122,8 +122,8 @@ void DrawPlayerFace(uint32 face, int color, int x, int y)
} }
/* Draw the eyes */ /* Draw the eyes */
uint eye_colour = GB(face, 6, 4); uint eye_colour = GB(face, 20, 3);
uint eyebrows = GB(face, 20, 3); uint eyebrows = GB(face, 6, 4);
SpriteID pal; SpriteID pal;
if (eye_colour < 6) { if (eye_colour < 6) {