petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r3181) -Bracing

Browse Source 
-Indentation
-Whitespace
-DeMorgan's Law
-Test with NULL or 0 for non-booleans
-'\0' instead of 0 for chars
-Remove redundantly redundant comments (like DoFoo(); // Do foo)
-Join multiple short lines with a single statement
-Split single lines with multiple statements
-Avoid assignments in if
This commit is contained in:
tron
2005-11-14 19:48:04 +00:00
parent d8b56c123e
commit f7abff5f96
63 changed files with 1984 additions and 2359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
players.c
View File

@@ -135,17 +135,17 @@ void DrawPlayerFace(uint32 face, int color, int x, int y)
/* draw the hair */
{
uint val = GB(face, 16, 4);
if (!(flag&2)) {
if (!(flag&1)) {
DrawSprite(0x382 + (val*9>>4), x, y);
if (flag & 2) {
if (flag & 1) {
DrawSprite(0x3D9 + (val * 5 >> 4), x, y);
} else {
DrawSprite(0x38B + (val*5>>4), x, y);
DrawSprite(0x3D4 + (val * 5 >> 4), x, y);
}
} else {
if (!(flag&1)) {
DrawSprite(0x3D4 + (val*5>>4), x, y);
if (flag & 1) {
DrawSprite(0x38B + (val * 5 >> 4), x, y);
} else {
DrawSprite(0x3D9 + (val*5>>4), x, y);
DrawSprite(0x382 + (val * 9 >> 4), x, y);
}
}
}
@@ -163,9 +163,7 @@ void DrawPlayerFace(uint32 face, int color, int x, int y)
DrawSprite(0x37B + (GB(val, 2, 2) * 4 >> 2), x, y);
val >>= 4;
if (val < 3) {
DrawSprite((flag&2 ? 0x3D1 : 0x37F) + val, x, y);
}
if (val < 3) DrawSprite((flag & 2 ? 0x3D1 : 0x37F) + val, x, y);
}
}
@@ -173,14 +171,10 @@ void DrawPlayerFace(uint32 face, int color, int x, int y)
{
uint val = GB(face, 28, 3);
if (!(flag&2)) {
if (val<=1) {
DrawSprite(0x347 + val, x, y);
}
if (flag & 2) {
if (val <= 1) DrawSprite(0x3AE + val, x, y);
} else {
if (val<=1) {
DrawSprite(0x3AE + val, x, y);
}
if (val <= 1) DrawSprite(0x347 + val, x, y);
}
}
}