Mercurial > hg > openttd

changeset 3539:0bd856c18296 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r4402) Fix a faulty entry in the table for slopes under bridges, remove a now unnecessary test which hid the faulty entry till now and undo r4398 (don't do this!)
author tron <tron@openttd.org>
date Wed, 12 Apr 2006 19:05:31 +0000
parents 3bdd700911f8
children 9ce56da91abd
files tunnelbridge_cmd.c
diffstat 1 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -811,8 +811,8 @@
 
 static const byte _bridge_foundations[2][16] = {
 // 0 1  2  3  4 5 6 7  8 9 10 11 12 13 14 15
-	{1,16,18,3,20,5,0,7,22,0,10,11,12,13,14},
-	{1,15,17,0,19,5,6,7,21,9,10,11, 0,13,14},
+	{0,16,18,3,20,5,0,7,22,0,10,11,12,13,14},
+	{0,15,17,0,19,5,6,7,21,9,10,11, 0,13,14},
 };
 
 extern const byte _road_sloped_sprites[14];
@@ -986,11 +986,9 @@
 			int x,y;
 
 			if (IsTransportUnderBridge(ti->tile)) {
-				// draw foundation?
-				if (ti->tileh) {
-					int f = _bridge_foundations[axis][ti->tileh];
-					if (f) DrawFoundation(ti, f);
-				}
+				uint f = _bridge_foundations[axis][ti->tileh];
+
+				if (f != 0) DrawFoundation(ti, f);
 
 				if (GetTransportTypeUnderBridge(ti->tile) == TRANSPORT_RAIL) {
 					const RailtypeInfo* rti = GetRailTypeInfo(GetRailType(ti->tile));
@@ -1123,7 +1121,6 @@
 				uint f = _bridge_foundations[GetBridgeAxis(tile)][tileh];
 
 				if (f != 0) {
-					if (f == 1) return z;
 					if (f < 15) return z + 8;
 					tileh = _inclined_tileh[f - 15];
 				}