diff options
| author | tron <tron@openttd.org> | 2005-11-15 09:47:25 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-11-15 09:47:25 +0000 |
| commit | 24f857ed5edab0bf79b1f0f2c18b9a6280103ffb (patch) | |
| tree | d754a4bbb7a3e5f12b31a28e64345ca8be3cdd20 /rail_cmd.c | |
| parent | 9f8c5d8fd268cc6007047025650951a546133ce1 (diff) | |
| download | openttd-24f857ed5edab0bf79b1f0f2c18b9a6280103ffb.tar.xz | |
(svn r3187) Simplify overly complicated ifs, especially if (foo) return false; else return true; is confusing
Diffstat (limited to 'rail_cmd.c')
| -rw-r--r-- | rail_cmd.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/rail_cmd.c b/rail_cmd.c index 45021856a..6cc2e1dfd 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -1225,12 +1225,7 @@ static uint32 _drawtile_track_palette; static void DrawTrackFence_NW(const TileInfo *ti) { uint32 image = 0x515; - if (ti->tileh != 0) { - image = 0x519; - if (!(ti->tileh & 2)) { - image = 0x51B; - } - } + if (ti->tileh != 0) image = (ti->tileh & 2) ? 0x519 : 0x51B; AddSortableSpriteToDraw(image | _drawtile_track_palette, ti->x, ti->y+1, 16, 1, 4, ti->z); } @@ -1238,12 +1233,7 @@ static void DrawTrackFence_NW(const TileInfo *ti) static void DrawTrackFence_SE(const TileInfo *ti) { uint32 image = 0x515; - if (ti->tileh != 0) { - image = 0x519; - if (!(ti->tileh & 2)) { - image = 0x51B; - } - } + if (ti->tileh != 0) image = (ti->tileh & 2) ? 0x519 : 0x51B; AddSortableSpriteToDraw(image | _drawtile_track_palette, ti->x, ti->y+15, 16, 1, 4, ti->z); } @@ -1257,12 +1247,7 @@ static void DrawTrackFence_NW_SE(const TileInfo *ti) static void DrawTrackFence_NE(const TileInfo *ti) { uint32 image = 0x516; - if (ti->tileh != 0) { - image = 0x51A; - if (!(ti->tileh & 2)) { - image = 0x51C; - } - } + if (ti->tileh != 0) image = (ti->tileh & 2) ? 0x51A : 0x51C; AddSortableSpriteToDraw(image | _drawtile_track_palette, ti->x+1, ti->y, 1, 16, 4, ti->z); } @@ -1270,12 +1255,7 @@ static void DrawTrackFence_NE(const TileInfo *ti) static void DrawTrackFence_SW(const TileInfo *ti) { uint32 image = 0x516; - if (ti->tileh != 0) { - image = 0x51A; - if (!(ti->tileh & 2)) { - image = 0x51C; - } - } + if (ti->tileh != 0) image = (ti->tileh & 2) ? 0x51A : 0x51C; AddSortableSpriteToDraw(image | _drawtile_track_palette, ti->x+15, ti->y, 1, 16, 4, ti->z); } |