(svn r827) Dye bridge ramps in the matching colours compared to the rest of the bridge

This fix was created by Celestar

1 files changed, 23 insertions, 15 deletions

diff --git a/table/bridge_land.h b/table/bridge_land.h
index 2f562f2c7..f72578b59 100644
--- a/table/bridge_land.h
+++ b/table/bridge_land.h
@@ -22,8 +22,8 @@ static const PalSpriteID _bridge_sprite_table_2_0[] = {
 static const PalSpriteID _bridge_sprite_table_2_1[] = {
 	    0x986,     0x988,     0x985,     0x987,     0x98A,     0x98C,     0x989,     0x98B,
 	0x31D898E, 0x31D8990, 0x31D898D, 0x31D898F, 0x31D8992, 0x31D8994, 0x31D8991, 0x31D8993,
-	   0x10E7,    0x10E9,    0x10E6,    0x10E8,    0x10EB,    0x10ED,    0x10EA,    0x10EC,
-	   0x110F,    0x1111,    0x110E,    0x1110,    0x1113,    0x1115,    0x1112,    0x1114,
+	0x31D90E7, 0x31D90E9, 0x31D90E6, 0x31D90E8, 0x31D90EB, 0x31D90ED, 0x31D90EA, 0x31D90EC,
+	0x31D910F, 0x31D9111, 0x31D910E, 0x31D9110, 0x31D9113, 0x31D9115, 0x31D9112, 0x31D9114,
 };
 
 static const PalSpriteID _bridge_sprite_table_2_poles[] = {
@@ -164,8 +164,8 @@ static const PalSpriteID _bridge_sprite_table_5_5[] = {
 static const PalSpriteID _bridge_sprite_table_5_6[] = {
 	    0x986,     0x988,     0x985,     0x987,     0x98A,     0x98C,     0x989,     0x98B,
 	0x321898E, 0x3218990, 0x321898D, 0x321898F, 0x3218992, 0x3218994, 0x3218991, 0x3218993,
-	   0x10E7,    0x10E9,    0x10E6,    0x10E8,    0x10EB,    0x10ED,    0x10EA,    0x10EC,
-	   0x110F,    0x1111,    0x110E,    0x1110,    0x1113,    0x1115,    0x1112,    0x1114,
+	0x32190E7, 0x32190E9, 0x32190E6, 0x32190E8, 0x32190EB, 0x32190ED, 0x32190EA, 0x32190EC,
+	0x321910F, 0x3219111, 0x321910E, 0x3219110, 0x3219113, 0x3219115, 0x3219112, 0x3219114,
 	0x0, SPR_OPENTTD_BASE + 35,
 };
 
@@ -230,6 +230,14 @@ static const PalSpriteID _bridge_sprite_table_3_5[] = {
 	0x3209120, 0x32089C1,       0x0,       0x0, 0x3209121, 0x32089C2,       0x0,       0x0,
 };
 
+static const PalSpriteID _bridge_sprite_table_3_6[] = {
+	    0x986,     0x988,     0x985,     0x987,     0x98A,     0x98C,     0x989,     0x98B,
+	0x320898E, 0x3208990, 0x320898D, 0x320898F, 0x3208992, 0x3208994, 0x3208991, 0x3208993,
+	0x32090E7, 0x32090E9, 0x32090E6, 0x32090E8, 0x32090EB, 0x32090ED, 0x32090EA, 0x32090EC,
+	0x320910F, 0x3209111, 0x320910E, 0x3209110, 0x3209113, 0x3209115, 0x3209112, 0x3209114,
+	0x0, SPR_OPENTTD_BASE + 35,
+};
+
 static const PalSpriteID _bridge_sprite_table_3_poles[] = {
 	SPR_OPENTTD_BASE + 36 + 0x3208000,
 	SPR_OPENTTD_BASE + 37 + 0x3208000,
@@ -251,9 +259,9 @@ static const PalSpriteID _bridge_sprite_table_3_poles[] = {
 
 static const PalSpriteID _bridge_sprite_table_1_1[] = {
 	    0x986,     0x988,     0x985,     0x987,     0x98A,     0x98C,     0x989,     0x98B,
-	0x320898E, 0x3208990, 0x320898D, 0x320898F, 0x3208992, 0x3208994, 0x3208991, 0x3208993,
-	   0x10E7,    0x10E9,    0x10E6,    0x10E8,    0x10EB,    0x10ED,    0x10EA,    0x10EC,
-	   0x110F,    0x1111,    0x110E,    0x1110,    0x1113,    0x1115,    0x1112,    0x1114,
+	0x31E898E, 0x31E8990, 0x31E898D, 0x31E898F, 0x31E8992, 0x31E8994, 0x31E8991, 0x31E8993,
+	0x31E90E7, 0x31E90E9, 0x31E90E6, 0x31E90E8, 0x31E90EB, 0x31E90ED, 0x31E90EA, 0x31E90EC,
+	0x31E910F, 0x31E9111, 0x31E910E, 0x31E9110, 0x31E9113, 0x31E9115, 0x31E9112, 0x31E9114,
 };
 
 static const PalSpriteID _bridge_sprite_table_1_poles[] = {
@@ -348,8 +356,8 @@ static const PalSpriteID _bridge_sprite_table_7_2[] = {
 static const PalSpriteID _bridge_sprite_table_7_3[] = {
 	    0x986,     0x988,     0x985,     0x987,     0x98A,     0x98C,     0x989,     0x98B,
 	0x31C898E, 0x31C8990, 0x31C898D, 0x31C898F, 0x31C8992, 0x31C8994, 0x31C8991, 0x31C8993,
-	   0x10E7,    0x10E9,    0x10E6,    0x10E8,    0x10EB,    0x10ED,    0x10EA,    0x10EC,
-	   0x110F,    0x1111,    0x110E,    0x1110,    0x1113,    0x1115,    0x1112,    0x1114,
+	0x31C90E7, 0x31C90E9, 0x31C90E6, 0x31C90E8, 0x31C90EB, 0x31C90ED, 0x31C90EA, 0x31C90EC,
+	0x31C910F, 0x31C9111, 0x31C910E, 0x31C9110, 0x31C9113, 0x31C9115, 0x31C9112, 0x31C9114,
 };
 
 static const PalSpriteID _bridge_sprite_table_7_poles[] = {
@@ -395,8 +403,8 @@ static const PalSpriteID _bridge_sprite_table_8_2[] = {
 static const PalSpriteID _bridge_sprite_table_8_3[] = {
 	    0x986,     0x988,     0x985,     0x987,     0x98A,     0x98C,     0x989,     0x98B,
 	0x31E898E, 0x31E8990, 0x31E898D, 0x31E898F, 0x31E8992, 0x31E8994, 0x31E8991, 0x31E8993,
-	   0x10E7,    0x10E9,    0x10E6,    0x10E8,    0x10EB,    0x10ED,    0x10EA,    0x10EC,
-	   0x110F,    0x1111,    0x110E,    0x1110,    0x1113,    0x1115,    0x1112,    0x1114,
+	0x31E90E7, 0x31E90E9, 0x31E90E6, 0x31E90E8, 0x31E90EB, 0x31E90ED, 0x31E90EA, 0x31E90EC,
+	0x31E910F, 0x31E9111, 0x31E910E, 0x31E9110, 0x31E9113, 0x31E9115, 0x31E9112, 0x31E9114,
 };
 
 static const PalSpriteID _bridge_sprite_table_8_poles[] = {
@@ -623,7 +631,7 @@ static const uint32 * const _bridge_sprite_table_3[] = {
 	_bridge_sprite_table_3_3,
 	_bridge_sprite_table_3_4,
 	_bridge_sprite_table_3_5,
-	_bridge_sprite_table_1_1,
+	_bridge_sprite_table_3_6,
 };
 
 static const uint32 * const _bridge_sprite_table_6[] = {
@@ -693,7 +701,7 @@ static const uint32 * const _bridge_sprite_table_10[] = {
 	_bridge_sprite_table_10_2,
 	_bridge_sprite_table_10_2,
 	_bridge_sprite_table_10_2,
-	_bridge_sprite_table_6_3,
+	_bridge_sprite_table_4_6,
 };
 
 static const uint32 * const _bridge_sprite_table_11[] = {
@@ -703,7 +711,7 @@ static const uint32 * const _bridge_sprite_table_11[] = {
 	_bridge_sprite_table_11_2,
 	_bridge_sprite_table_11_2,
 	_bridge_sprite_table_11_2,
-	_bridge_sprite_table_6_3,
+	_bridge_sprite_table_5_6,
 };
 
 static const uint32 * const _bridge_sprite_table_12[] = {
@@ -713,7 +721,7 @@ static const uint32 * const _bridge_sprite_table_12[] = {
 	_bridge_sprite_table_12_2,
 	_bridge_sprite_table_12_2,
 	_bridge_sprite_table_12_2,
-	_bridge_sprite_table_6_3,
+	_bridge_sprite_table_3_6,
 };
 
 static const uint32 * const * const _bridge_sprite_table[] = {