summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorludde <ludde@openttd.org>2005-07-15 12:16:16 +0000
committerludde <ludde@openttd.org>2005-07-15 12:16:16 +0000
commitb21ee889fec9b8d197692969855cb54675edfa6d (patch)
tree58447f3b57befd902eb1c5be412629d9f9807fb4
parenta9b4e7963bcee40bc43864436cd89246fcfeb330 (diff)
downloadopenttd-b21ee889fec9b8d197692969855cb54675edfa6d.tar.xz
(svn r2570) Fix: Removed some code that had no effect.
-rw-r--r--industry_cmd.c3
-rw-r--r--town_cmd.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/industry_cmd.c b/industry_cmd.c
index fab71b42c..6ed9446b0 100644
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -821,8 +821,7 @@ static void TileLoop_Industry(TileIndex tile)
Industry *i = GetIndustry(_m[tile].m2);
if (i->was_cargo_delivered) {
i->was_cargo_delivered = false;
- if ((_m[tile].m4|_m[tile].m3) != 0)
- _m[tile].m4 = 0;
+ _m[tile].m4 = 0;
AddAnimatedTile(tile);
}
}
diff --git a/town_cmd.c b/town_cmd.c
index 20e29569e..ad394b620 100644
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -159,8 +159,7 @@ static void AnimateTile_Town(TileIndex tile)
if (_tick_counter & 3)
return;
- if (_m[tile].m4 != 4 && _m[tile].m4 != 5)
- return;
+ assert(_m[tile].m4 == 4 || _m[tile].m4 == 5);
if (!((old=_m[tile].owner)&0x80)) {
_m[tile].owner |= 0x80;