Merge 38462627db into 614a01907a

Codechange: Make functions for click and confirm beeps. (#14484 )
Avoids repetition.
2025-07-27 20:54:40 +00:00 · 2025-07-27 21:54:32 +01:00 · 2025-07-27 20:14:37 +01:00 · 2025-01-02 15:55:42 +00:00
19 changed files with 222 additions and 199 deletions
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@ -509,7 +509,7 @@ public:
 				this->SetWidgetLoweredState(WID_AP_BTN_DONTHILIGHT, !_settings_client.gui.station_show_coverage);
 				this->SetWidgetLoweredState(WID_AP_BTN_DOHILIGHT, _settings_client.gui.station_show_coverage);
 				this->SetDirty();
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->UpdateSelectSize();
 				SetViewportCatchmentStation(nullptr, true);
 				break;
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@ -469,7 +469,7 @@ public:
 				this->RaiseWidget(_settings_client.gui.station_show_coverage + BDSW_LT_OFF);
 				_settings_client.gui.station_show_coverage = (widget != BDSW_LT_OFF);
 				this->LowerWidget(_settings_client.gui.station_show_coverage + BDSW_LT_OFF);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				SetViewportCatchmentStation(nullptr, true);
 				break;
@ -580,7 +580,7 @@ public:
 				this->RaiseWidget(WID_BDD_X + _ship_depot_direction);
 				_ship_depot_direction = (widget == WID_BDD_X ? AXIS_X : AXIS_Y);
 				this->LowerWidget(WID_BDD_X + _ship_depot_direction);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				UpdateDocksDirection();
 				this->SetDirty();
 				break;
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@ -323,7 +323,7 @@ static void StartGeneratingLandscape(GenerateLandscapeWindowMode mode)
 	MakeNewgameSettingsLive();
 	ResetGRFConfig(true);

-	if (_settings_client.sound.confirm) SndPlayFx(SND_15_BEEP);
+	SndConfirmBeep();
 	switch (mode) {
 		case GLWM_GENERATE:  _switch_mode = (_game_mode == GM_EDITOR) ? SM_GENRANDLAND    : SM_NEWGAME;         break;
 		case GLWM_HEIGHTMAP: _switch_mode = (_game_mode == GM_EDITOR) ? SM_LOAD_HEIGHTMAP : SM_START_HEIGHTMAP; break;
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@ -3076,7 +3076,7 @@ struct IndustryCargoesWindow : public Window {
 			case WID_IC_NOTIFY:
 				this->ToggleWidgetLoweredState(WID_IC_NOTIFY);
 				this->SetWidgetDirty(WID_IC_NOTIFY);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();

 				if (this->IsWidgetLowered(WID_IC_NOTIFY)) {
 					if (FindWindowByClass(WC_SMALLMAP) == nullptr) ShowSmallMap();
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@ -64,7 +64,7 @@ bool HandlePlacePushButton(Window *w, WidgetID widget, CursorID cursor, HighLigh
 {
 	if (w->IsWidgetDisabled(widget)) return false;

-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	w->SetDirty();

 	if (w->IsWidgetLowered(widget)) {
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@ -319,7 +319,7 @@ public:
 				if (_object_gui.sel_type != std::numeric_limits<uint16_t>::max()) {
 					_object_gui.sel_view = this->GetWidget<NWidgetBase>(widget)->GetParentWidget<NWidgetMatrix>()->GetCurrentElement();
 					this->InvalidateData(PickerInvalidation::Position);
-					if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+					SndClickBeep();
 				}
 				break;

--- a/src/picker_gui.cpp
+++ b/src/picker_gui.cpp
@ -384,7 +384,7 @@ void PickerWindow::OnClick(Point pt, WidgetID widget, int)
 				this->callbacks.SetSelectedClass(*it);
 				this->InvalidateData({PickerInvalidation::Type, PickerInvalidation::Position, PickerInvalidation::Validate});
 			}
-			if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+			SndClickBeep();
 			CloseWindowById(WC_SELECT_STATION, 0);
 			break;
 		}
@ -434,7 +434,7 @@ void PickerWindow::OnClick(Point pt, WidgetID widget, int)
 				this->callbacks.SetSelectedType(item.index);
 				this->InvalidateData(PickerInvalidation::Position);
 			}
-			if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+			SndClickBeep();
 			CloseWindowById(WC_SELECT_STATION, 0);
 			break;
 		}
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@ -357,7 +357,7 @@ static void BuildRailClick_Remove(Window *w)
 {
 	if (w->IsWidgetDisabled(WID_RAT_REMOVE)) return;
 	ToggleRailButton_Remove(w);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();

 	/* handle station builder */
 	if (w->IsWidgetLowered(WID_RAT_BUILD_STATION)) {
@ -1239,7 +1239,7 @@ public:
 				this->RaiseWidget(WID_BRAS_PLATFORM_DIR_X + _station_gui.axis);
 				_station_gui.axis = (Axis)(widget - WID_BRAS_PLATFORM_DIR_X);
 				this->LowerWidget(WID_BRAS_PLATFORM_DIR_X + _station_gui.axis);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				CloseWindowById(WC_SELECT_STATION, 0);
 				break;
@ -1271,7 +1271,7 @@ public:

 				this->LowerWidget(_settings_client.gui.station_numtracks + WID_BRAS_PLATFORM_NUM_BEGIN);
 				this->LowerWidget(_settings_client.gui.station_platlength + WID_BRAS_PLATFORM_LEN_BEGIN);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				CloseWindowById(WC_SELECT_STATION, 0);
 				break;
@ -1304,7 +1304,7 @@ public:

 				this->LowerWidget(_settings_client.gui.station_numtracks + WID_BRAS_PLATFORM_NUM_BEGIN);
 				this->LowerWidget(_settings_client.gui.station_platlength + WID_BRAS_PLATFORM_LEN_BEGIN);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				CloseWindowById(WC_SELECT_STATION, 0);
 				break;
@ -1338,7 +1338,7 @@ public:

 				this->SetWidgetLoweredState(_settings_client.gui.station_numtracks + WID_BRAS_PLATFORM_NUM_BEGIN, !_settings_client.gui.station_dragdrop);
 				this->SetWidgetLoweredState(_settings_client.gui.station_platlength + WID_BRAS_PLATFORM_LEN_BEGIN, !_settings_client.gui.station_dragdrop);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				CloseWindowById(WC_SELECT_STATION, 0);
 				break;
@ -1350,7 +1350,7 @@ public:

 				this->SetWidgetLoweredState(WID_BRAS_HIGHLIGHT_OFF, !_settings_client.gui.station_show_coverage);
 				this->SetWidgetLoweredState(WID_BRAS_HIGHLIGHT_ON, _settings_client.gui.station_show_coverage);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				SetViewportCatchmentStation(nullptr, true);
 				break;
@ -1743,7 +1743,7 @@ struct BuildRailDepotWindow : public PickerWindowBase {
 				this->RaiseWidget(WID_BRAD_DEPOT_NE + _build_depot_direction);
 				_build_depot_direction = (DiagDirection)(widget - WID_BRAD_DEPOT_NE);
 				this->LowerWidget(WID_BRAD_DEPOT_NE + _build_depot_direction);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				break;
 		}
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@ -582,7 +582,7 @@ struct BuildRoadToolbarWindow : Window {

 				CloseWindowById(WC_SELECT_STATION, 0);
 				ToggleRoadButton_Remove(this);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				break;

 			case WID_ROT_CONVERT_ROAD:
@ -1145,7 +1145,7 @@ struct BuildRoadDepotWindow : public PickerWindowBase {
 				this->RaiseWidget(WID_BROD_DEPOT_NE + _road_depot_orientation);
 				_road_depot_orientation = (DiagDirection)(widget - WID_BROD_DEPOT_NE);
 				this->LowerWidget(WID_BROD_DEPOT_NE + _road_depot_orientation);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				break;

@ -1477,7 +1477,7 @@ public:
 				this->RaiseWidget(WID_BROS_STATION_NE + _roadstop_gui.orientation);
 				_roadstop_gui.orientation = (DiagDirection)(widget - WID_BROS_STATION_NE);
 				this->LowerWidget(WID_BROS_STATION_NE + _roadstop_gui.orientation);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				CloseWindowById(WC_SELECT_STATION, 0);
 				break;
@ -1487,7 +1487,7 @@ public:
 				this->RaiseWidget(_settings_client.gui.station_show_coverage + WID_BROS_LT_OFF);
 				_settings_client.gui.station_show_coverage = (widget != WID_BROS_LT_OFF);
 				this->LowerWidget(_settings_client.gui.station_show_coverage + WID_BROS_LT_OFF);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				SetViewportCatchmentStation(nullptr, true);
 				break;
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@ -1717,7 +1717,7 @@ public:
 				const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_SM_MAP);
 				Point zoom_pt = { (int)wid->current_x / 2, (int)wid->current_y / 2};
 				this->SetZoomLevel((widget == WID_SM_ZOOM_IN) ? ZLC_ZOOM_IN : ZLC_ZOOM_OUT, &zoom_pt);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				break;
 			}

@ -1729,13 +1729,13 @@ public:
 			case WID_SM_VEGETATION: // Show vegetation
 			case WID_SM_OWNERS:     // Show land owners
 				this->SwitchMapType((SmallMapType)(widget - WID_SM_CONTOUR));
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				break;

 			case WID_SM_CENTERMAP: // Center the smallmap again
 				this->SmallMapCenterOnCurrentPos();
 				this->HandleButtonClick(WID_SM_CENTERMAP);
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				break;

 			case WID_SM_TOGGLETOWNNAME: // Toggle town names
@ -1743,7 +1743,7 @@ public:
 				this->SetWidgetLoweredState(WID_SM_TOGGLETOWNNAME, this->show_towns);

 				this->SetDirty();
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				break;

 			case WID_SM_SHOW_IND_NAMES: // Toggle industry names
@ -1751,7 +1751,7 @@ public:
 				this->SetWidgetLoweredState(WID_SM_SHOW_IND_NAMES, this->show_ind_names);

 				this->SetDirty();
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				break;

 			case WID_SM_LEGEND: // Legend
--- a/src/sound.cpp
+++ b/src/sound.cpp
@ -247,6 +247,22 @@ void SndPlayFx(SoundID sound)
 	StartSound(sound, 0.5, UINT8_MAX);
 }

+/**
+ * Play a beep sound for a click event if enabled in settings.
+ */
+void SndClickBeep()
+{
+	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+}
+
+/**
+ * Play a beep sound for a confirm event if enabled in settings.
+ */
+void SndConfirmBeep()
+{
+	if (_settings_client.sound.confirm) SndPlayFx(SND_15_BEEP);
+}
+
 /** Names corresponding to the sound set's files */
 static const std::string_view _sound_file_names[] = { "samples" };

--- a/src/sound_func.h
+++ b/src/sound_func.h
@ -21,4 +21,7 @@ void SndPlayVehicleFx(SoundID sound, const Vehicle *v);
 void SndPlayFx(SoundID sound);
 void SndCopyToPool();

+void SndClickBeep();
+void SndConfirmBeep();
+
 #endif /* SOUND_FUNC_H */
--- a/src/table/bridge_land.h
+++ b/src/table/bridge_land.h
@ -47,7 +47,7 @@ static const PalSpriteID _aqueduct_sprite_table_heads[] = {
 	{SPR_AQUEDUCT_RAMP_SW, PAL_NONE}, {SPR_AQUEDUCT_RAMP_SE, PAL_NONE}, {SPR_AQUEDUCT_RAMP_NE, PAL_NONE}, {SPR_AQUEDUCT_RAMP_NW, PAL_NONE},
 };

-static const PalSpriteID _bridge_sprite_table_4_0[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_oxide_north[] = {
 	{  0x9A9, PAL_NONE }, {  0x99F, PAL_NONE }, {  0x9B1, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9A5, PAL_NONE }, {  0x997, PAL_NONE }, {  0x9AD, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x99D, PAL_NONE }, {  0x99F, PAL_NONE }, {  0x9B1, PAL_NONE }, {    0x0, PAL_NONE },
@ -58,7 +58,7 @@ static const PalSpriteID _bridge_sprite_table_4_0[] = {
 	{ 0x1116, PAL_NONE }, {  0x997, PAL_NONE }, {  0x9AD, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_4_1[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_oxide_south[] = {
 	{  0x9AA, PAL_NONE }, {  0x9A0, PAL_NONE }, {  0x9B2, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9A6, PAL_NONE }, {  0x998, PAL_NONE }, {  0x9AE, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x99E, PAL_NONE }, {  0x9A0, PAL_NONE }, {  0x9B2, PAL_NONE }, {    0x0, PAL_NONE },
@ -69,7 +69,7 @@ static const PalSpriteID _bridge_sprite_table_4_1[] = {
 	{ 0x1117, PAL_NONE }, {  0x998, PAL_NONE }, {  0x9AE, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_4_2[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_oxide_inner_north[] = {
 	{  0x9AC, PAL_NONE }, {  0x9A4, PAL_NONE }, {  0x9B4, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9A8, PAL_NONE }, {  0x99C, PAL_NONE }, {  0x9B0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9A2, PAL_NONE }, {  0x9A4, PAL_NONE }, {  0x9B4, PAL_NONE }, {    0x0, PAL_NONE },
@ -80,7 +80,7 @@ static const PalSpriteID _bridge_sprite_table_4_2[] = {
 	{ 0x1119, PAL_NONE }, {  0x99C, PAL_NONE }, {  0x9B0, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_4_3[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_oxide_inner_south[] = {
 	{  0x9AB, PAL_NONE }, {  0x9A3, PAL_NONE }, {  0x9B3, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9A7, PAL_NONE }, {  0x99B, PAL_NONE }, {  0x9AF, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9A1, PAL_NONE }, {  0x9A3, PAL_NONE }, {  0x9B3, PAL_NONE }, {    0x0, PAL_NONE },
@ -91,7 +91,7 @@ static const PalSpriteID _bridge_sprite_table_4_3[] = {
 	{ 0x1118, PAL_NONE }, {  0x99B, PAL_NONE }, {  0x9AF, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_4_4[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_oxide_middle_odd[] = {
 	{  0x9B6, PAL_NONE }, {  0x9BA, PAL_NONE }, {  0x9BC, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9B5, PAL_NONE }, {  0x9B9, PAL_NONE }, {  0x9BB, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9B8, PAL_NONE }, {  0x9BA, PAL_NONE }, {  0x9BC, PAL_NONE }, {    0x0, PAL_NONE },
@ -102,7 +102,7 @@ static const PalSpriteID _bridge_sprite_table_4_4[] = {
 	{ 0x111E, PAL_NONE }, {  0x9B9, PAL_NONE }, {  0x9BB, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_4_5[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_middle_even[] = {
 	{  0x9BD, PAL_NONE }, {  0x9C1, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9BE, PAL_NONE }, {  0x9C2, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9BF, PAL_NONE }, {  0x9C1, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
@ -113,7 +113,7 @@ static const PalSpriteID _bridge_sprite_table_4_5[] = {
 	{ 0x1121, PAL_NONE }, {  0x9C2, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_4_6[] = {
+static const PalSpriteID _bridge_sprite_table_generic_oxide_heads[] = {
 	{  0x986, PAL_NONE }, {  0x988, PAL_NONE }, {  0x985, PAL_NONE }, {  0x987, PAL_NONE },
 	{  0x98A, PAL_NONE }, {  0x98C, PAL_NONE }, {  0x989, PAL_NONE }, {  0x98B, PAL_NONE },
 	{  0x98E, PAL_NONE }, {  0x990, PAL_NONE }, {  0x98D, PAL_NONE }, {  0x98F, PAL_NONE },
@ -124,7 +124,7 @@ static const PalSpriteID _bridge_sprite_table_4_6[] = {
 	{ 0x1113, PAL_NONE }, { 0x1115, PAL_NONE }, { 0x1112, PAL_NONE }, { 0x1114, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_5_0[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_yellow_north[] = {
 	{  0x9A9, PALETTE_TO_STRUCT_YELLOW }, { 0x99F, PALETTE_TO_STRUCT_YELLOW }, { 0x9B1, PALETTE_TO_STRUCT_YELLOW }, {  0x0, PAL_NONE },
 	{  0x9A5, PALETTE_TO_STRUCT_YELLOW }, { 0x997, PALETTE_TO_STRUCT_YELLOW }, { 0x9AD, PALETTE_TO_STRUCT_YELLOW }, {  0x0, PAL_NONE },
 	{  0x99D, PALETTE_TO_STRUCT_YELLOW }, { 0x99F, PALETTE_TO_STRUCT_YELLOW }, { 0x9B1, PALETTE_TO_STRUCT_YELLOW }, {  0x0, PAL_NONE },
@ -135,7 +135,7 @@ static const PalSpriteID _bridge_sprite_table_5_0[] = {
 	{ 0x1116, PALETTE_TO_STRUCT_YELLOW }, { 0x997, PALETTE_TO_STRUCT_YELLOW }, { 0x9AD, PALETTE_TO_STRUCT_YELLOW }, {  0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_5_1[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_yellow_south[] = {
 	{  0x9AA, PALETTE_TO_STRUCT_YELLOW }, { 0x9A0, PALETTE_TO_STRUCT_YELLOW }, { 0x9B2, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0x9A6, PALETTE_TO_STRUCT_YELLOW }, { 0x998, PALETTE_TO_STRUCT_YELLOW }, { 0x9AE, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0x99E, PALETTE_TO_STRUCT_YELLOW }, { 0x9A0, PALETTE_TO_STRUCT_YELLOW }, { 0x9B2, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
@ -146,7 +146,7 @@ static const PalSpriteID _bridge_sprite_table_5_1[] = {
 	{ 0x1117, PALETTE_TO_STRUCT_YELLOW }, { 0x998, PALETTE_TO_STRUCT_YELLOW }, { 0x9AE, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_5_2[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_yellow_inner_north[] = {
 	{  0x9AC, PALETTE_TO_STRUCT_YELLOW }, { 0x9A4, PALETTE_TO_STRUCT_YELLOW }, { 0x9B4, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0x9A8, PALETTE_TO_STRUCT_YELLOW }, { 0x99C, PALETTE_TO_STRUCT_YELLOW }, { 0x9B0, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0x9A2, PALETTE_TO_STRUCT_YELLOW }, { 0x9A4, PALETTE_TO_STRUCT_YELLOW }, { 0x9B4, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
@ -157,7 +157,7 @@ static const PalSpriteID _bridge_sprite_table_5_2[] = {
 	{ 0x1119, PALETTE_TO_STRUCT_YELLOW }, { 0x99C, PALETTE_TO_STRUCT_YELLOW }, { 0x9B0, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_5_3[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_yellow_inner_south[] = {
 	{  0x9AB, PALETTE_TO_STRUCT_YELLOW }, { 0x9A3, PALETTE_TO_STRUCT_YELLOW }, { 0x9B3, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0x9A7, PALETTE_TO_STRUCT_YELLOW }, { 0x99B, PALETTE_TO_STRUCT_YELLOW }, { 0x9AF, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0x9A1, PALETTE_TO_STRUCT_YELLOW }, { 0x9A3, PALETTE_TO_STRUCT_YELLOW }, { 0x9B3, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
@ -168,7 +168,7 @@ static const PalSpriteID _bridge_sprite_table_5_3[] = {
 	{ 0x1118, PALETTE_TO_STRUCT_YELLOW }, { 0x99B, PALETTE_TO_STRUCT_YELLOW }, { 0x9AF, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_5_4[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_yellow_middle_odd[] = {
 	{  0x9B6, PALETTE_TO_STRUCT_YELLOW }, { 0x9BA, PALETTE_TO_STRUCT_YELLOW }, { 0x9BC, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0x9B5, PALETTE_TO_STRUCT_YELLOW }, { 0x9B9, PALETTE_TO_STRUCT_YELLOW }, { 0x9BB, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0x9B8, PALETTE_TO_STRUCT_YELLOW }, { 0x9BA, PALETTE_TO_STRUCT_YELLOW }, { 0x9BC, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
@ -179,7 +179,7 @@ static const PalSpriteID _bridge_sprite_table_5_4[] = {
 	{ 0x111E, PALETTE_TO_STRUCT_YELLOW }, { 0x9B9, PALETTE_TO_STRUCT_YELLOW }, { 0x9BB, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_5_5[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_yellow_middle_even[] = {
 	{  0x9BD, PALETTE_TO_STRUCT_YELLOW }, { 0x9C1, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE }, {       0x0, PAL_NONE },
 	{  0x9BE, PALETTE_TO_STRUCT_YELLOW }, { 0x9C2, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE }, {       0x0, PAL_NONE },
 	{  0x9BF, PALETTE_TO_STRUCT_YELLOW }, { 0x9C1, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE }, {       0x0, PAL_NONE },
@ -190,7 +190,7 @@ static const PalSpriteID _bridge_sprite_table_5_5[] = {
 	{ 0x1121, PALETTE_TO_STRUCT_YELLOW }, { 0x9C2, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_5_6[] = {
+static const PalSpriteID _bridge_sprite_table_generic_yellow_heads[] = {
 	{  0x986, PAL_NONE }, {  0x988, PAL_NONE }, {  0x985, PAL_NONE }, {  0x987, PAL_NONE },
 	{  0x98A, PAL_NONE }, {  0x98C, PAL_NONE }, {  0x989, PAL_NONE }, {  0x98B, PAL_NONE },
 	{  0x98E, PALETTE_TO_STRUCT_YELLOW }, {  0x990, PALETTE_TO_STRUCT_YELLOW }, {  0x98D, PALETTE_TO_STRUCT_YELLOW }, {  0x98F, PALETTE_TO_STRUCT_YELLOW },
@ -201,7 +201,7 @@ static const PalSpriteID _bridge_sprite_table_5_6[] = {
 	{ 0x1113, PALETTE_TO_STRUCT_YELLOW }, { 0x1115, PALETTE_TO_STRUCT_YELLOW }, { 0x1112, PALETTE_TO_STRUCT_YELLOW }, { 0x1114, PALETTE_TO_STRUCT_YELLOW },
 };

-static const PalSpriteID _bridge_sprite_table_6_0[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_oxide_north[] = {
 	{  0x9CD, PAL_NONE }, {  0x9D9, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9CE, PAL_NONE }, {  0x9DA, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9D3, PAL_NONE }, {  0x9D9, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
@ -212,7 +212,7 @@ static const PalSpriteID _bridge_sprite_table_6_0[] = {
 	{ 0x1125, PAL_NONE }, {  0x9DA, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_6_1[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_oxide_south[] = {
 	{  0x9CB, PAL_NONE }, {  0x9D7, PAL_NONE }, {  0x9DD, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9D0, PAL_NONE }, {  0x9DC, PAL_NONE }, {  0x9E0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9D1, PAL_NONE }, {  0x9D7, PAL_NONE }, {  0x9DD, PAL_NONE }, {    0x0, PAL_NONE },
@ -223,7 +223,7 @@ static const PalSpriteID _bridge_sprite_table_6_1[] = {
 	{ 0x1127, PAL_NONE }, {  0x9DC, PAL_NONE }, {  0x9E0, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_6_2[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_oxide_middle[] = {
 	{  0x9CC, PAL_NONE }, {  0x9D8, PAL_NONE }, {  0x9DE, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9CF, PAL_NONE }, {  0x9DB, PAL_NONE }, {  0x9DF, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9D2, PAL_NONE }, {  0x9D8, PAL_NONE }, {  0x9DE, PAL_NONE }, {    0x0, PAL_NONE },
@ -234,7 +234,7 @@ static const PalSpriteID _bridge_sprite_table_6_2[] = {
 	{ 0x1126, PAL_NONE }, {  0x9DB, PAL_NONE }, {  0x9DF, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_6_3[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_oxide_heads[] = {
 	{  0x986, PAL_NONE }, {  0x988, PAL_NONE }, {  0x985, PAL_NONE }, {  0x987, PAL_NONE },
 	{  0x98A, PAL_NONE }, {  0x98C, PAL_NONE }, {  0x989, PAL_NONE }, {  0x98B, PAL_NONE },
 	{  0x98E, PAL_NONE }, {  0x990, PAL_NONE }, {  0x98D, PAL_NONE }, {  0x98F, PAL_NONE },
@ -245,7 +245,7 @@ static const PalSpriteID _bridge_sprite_table_6_3[] = {
 	{ 0x1113, PAL_NONE }, { 0x1115, PAL_NONE }, { 0x1112, PAL_NONE }, { 0x1114, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_7_0[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_brown_north[] = {
 	{  0x9CD, PALETTE_TO_STRUCT_BROWN }, { 0x9D9, PALETTE_TO_STRUCT_BROWN }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9CE, PALETTE_TO_STRUCT_BROWN }, { 0x9DA, PALETTE_TO_STRUCT_BROWN }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9D3, PALETTE_TO_STRUCT_BROWN }, { 0x9D9, PALETTE_TO_STRUCT_BROWN }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
@ -256,7 +256,7 @@ static const PalSpriteID _bridge_sprite_table_7_0[] = {
 	{ 0x1125, PALETTE_TO_STRUCT_BROWN }, { 0x9DA, PALETTE_TO_STRUCT_BROWN }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_7_1[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_brown_south[] = {
 	{  0x9CB, PALETTE_TO_STRUCT_BROWN }, { 0x9D7, PALETTE_TO_STRUCT_BROWN }, { 0x9DD, PALETTE_TO_STRUCT_BROWN }, {       0x0, PAL_NONE },
 	{  0x9D0, PALETTE_TO_STRUCT_BROWN }, { 0x9DC, PALETTE_TO_STRUCT_BROWN }, { 0x9E0, PALETTE_TO_STRUCT_BROWN }, {       0x0, PAL_NONE },
 	{  0x9D1, PALETTE_TO_STRUCT_BROWN }, { 0x9D7, PALETTE_TO_STRUCT_BROWN }, { 0x9DD, PALETTE_TO_STRUCT_BROWN }, {       0x0, PAL_NONE },
@ -267,7 +267,7 @@ static const PalSpriteID _bridge_sprite_table_7_1[] = {
 	{ 0x1127, PALETTE_TO_STRUCT_BROWN }, { 0x9DC, PALETTE_TO_STRUCT_BROWN }, { 0x9E0, PALETTE_TO_STRUCT_BROWN }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_7_2[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_brown_middle[] = {
 	{  0x9CC, PALETTE_TO_STRUCT_BROWN }, { 0x9D8, PALETTE_TO_STRUCT_BROWN }, { 0x9DE, PALETTE_TO_STRUCT_BROWN }, {       0x0, PAL_NONE },
 	{  0x9CF, PALETTE_TO_STRUCT_BROWN }, { 0x9DB, PALETTE_TO_STRUCT_BROWN }, { 0x9DF, PALETTE_TO_STRUCT_BROWN }, {       0x0, PAL_NONE },
 	{  0x9D2, PALETTE_TO_STRUCT_BROWN }, { 0x9D8, PALETTE_TO_STRUCT_BROWN }, { 0x9DE, PALETTE_TO_STRUCT_BROWN }, {       0x0, PAL_NONE },
@ -278,7 +278,7 @@ static const PalSpriteID _bridge_sprite_table_7_2[] = {
 	{ 0x1126, PALETTE_TO_STRUCT_BROWN }, { 0x9DB, PALETTE_TO_STRUCT_BROWN }, { 0x9DF, PALETTE_TO_STRUCT_BROWN }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_7_3[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_brown_heads[] = {
 	{  0x986, PAL_NONE }, {  0x988, PAL_NONE }, {  0x985, PAL_NONE }, {  0x987, PAL_NONE },
 	{  0x98A, PAL_NONE }, {  0x98C, PAL_NONE }, {  0x989, PAL_NONE }, {  0x98B, PAL_NONE },
 	{  0x98E, PALETTE_TO_STRUCT_BROWN }, {  0x990, PALETTE_TO_STRUCT_BROWN }, {  0x98D, PALETTE_TO_STRUCT_BROWN }, {  0x98F, PALETTE_TO_STRUCT_BROWN },
@ -289,7 +289,7 @@ static const PalSpriteID _bridge_sprite_table_7_3[] = {
 	{ 0x1113, PALETTE_TO_STRUCT_BROWN }, { 0x1115, PALETTE_TO_STRUCT_BROWN }, { 0x1112, PALETTE_TO_STRUCT_BROWN }, { 0x1114, PALETTE_TO_STRUCT_BROWN },
 };

-static const PalSpriteID _bridge_sprite_table_8_0[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_red_north[] = {
 	{  0x9CD, PALETTE_TO_STRUCT_RED }, { 0x9D9, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE }, {      0x0, PAL_NONE },
 	{  0x9CE, PALETTE_TO_STRUCT_RED }, { 0x9DA, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE }, {      0x0, PAL_NONE },
 	{  0x9D3, PALETTE_TO_STRUCT_RED }, { 0x9D9, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE }, {      0x0, PAL_NONE },
@ -300,7 +300,7 @@ static const PalSpriteID _bridge_sprite_table_8_0[] = {
 	{ 0x1125, PALETTE_TO_STRUCT_RED }, { 0x9DA, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE }, {      0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_8_1[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_red_south[] = {
 	{  0x9CB, PALETTE_TO_STRUCT_RED }, { 0x9D7, PALETTE_TO_STRUCT_RED }, { 0x9DD, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE },
 	{  0x9D0, PALETTE_TO_STRUCT_RED }, { 0x9DC, PALETTE_TO_STRUCT_RED }, { 0x9E0, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE },
 	{  0x9D1, PALETTE_TO_STRUCT_RED }, { 0x9D7, PALETTE_TO_STRUCT_RED }, { 0x9DD, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE },
@ -311,7 +311,7 @@ static const PalSpriteID _bridge_sprite_table_8_1[] = {
 	{ 0x1127, PALETTE_TO_STRUCT_RED }, { 0x9DC, PALETTE_TO_STRUCT_RED }, { 0x9E0, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_8_2[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_red_middle[] = {
 	{  0x9CC, PALETTE_TO_STRUCT_RED }, { 0x9D8, PALETTE_TO_STRUCT_RED }, { 0x9DE, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE },
 	{  0x9CF, PALETTE_TO_STRUCT_RED }, { 0x9DB, PALETTE_TO_STRUCT_RED }, { 0x9DF, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE },
 	{  0x9D2, PALETTE_TO_STRUCT_RED }, { 0x9D8, PALETTE_TO_STRUCT_RED }, { 0x9DE, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE },
@ -322,7 +322,7 @@ static const PalSpriteID _bridge_sprite_table_8_2[] = {
 	{ 0x1126, PALETTE_TO_STRUCT_RED }, { 0x9DB, PALETTE_TO_STRUCT_RED }, { 0x9DF, PALETTE_TO_STRUCT_RED }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_8_3[] = {
+static const PalSpriteID _bridge_sprite_table_cantilever_red_heads[] = {
 	{  0x986, PAL_NONE }, {  0x988, PAL_NONE }, {  0x985, PAL_NONE }, {  0x987, PAL_NONE },
 	{  0x98A, PAL_NONE }, {  0x98C, PAL_NONE }, {  0x989, PAL_NONE }, {  0x98B, PAL_NONE },
 	{  0x98E, PALETTE_TO_STRUCT_RED }, {  0x990, PALETTE_TO_STRUCT_RED }, {  0x98D, PALETTE_TO_STRUCT_RED }, {  0x98F, PALETTE_TO_STRUCT_RED },
@ -399,7 +399,7 @@ static const PalSpriteID _bridge_sprite_table_archgirder_heads[] = {
 	MW( SPR_BTGEN_MGLV_RAMP_X_DOWN ),   MW( SPR_BTGEN_MGLV_RAMP_Y_DOWN ), MW( SPR_BTGEN_MGLV_RAMP_X_UP    ), MW( SPR_BTGEN_MGLV_RAMP_Y_UP    ),
 };

-static const PalSpriteID _bridge_sprite_table_concrete_suspended_A[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_concrete_north[] = {
 	MC( SPR_BTSUS_RAIL_X_REAR_TILE_A ), MC( SPR_BTSUS_X_FRONT_TILE_A ),   MC( SPR_BTSUS_X_PILLAR_TILE_A ),   MN( 0x0 ),
 	MC( SPR_BTSUS_RAIL_Y_REAR_TILE_A ), MC( SPR_BTSUS_Y_FRONT_TILE_A ),   MC( SPR_BTSUS_Y_PILLAR_TILE_A ),   MN( 0x0 ),
 	MC( SPR_BTSUS_ROAD_X_REAR_TILE_A ), MC( SPR_BTSUS_X_FRONT_TILE_A ),   MC( SPR_BTSUS_X_PILLAR_TILE_A ),   MN( 0x0 ),
@ -410,7 +410,7 @@ static const PalSpriteID _bridge_sprite_table_concrete_suspended_A[] = {
 	MC( SPR_BTSUS_MGLV_Y_REAR_TILE_A ), MC( SPR_BTSUS_Y_FRONT_TILE_A ),   MC( SPR_BTSUS_Y_PILLAR_TILE_A ),   MN( 0x0 ),
 };

-static const PalSpriteID _bridge_sprite_table_concrete_suspended_B[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_concrete_south[] = {
 	MC( SPR_BTSUS_RAIL_X_REAR_TILE_B ), MC( SPR_BTSUS_X_FRONT_TILE_B ),   MC( SPR_BTSUS_X_PILLAR_TILE_B ),   MN( 0x0 ),
 	MC( SPR_BTSUS_RAIL_Y_REAR_TILE_B ), MC( SPR_BTSUS_Y_FRONT_TILE_B ),   MC( SPR_BTSUS_Y_PILLAR_TILE_B ),   MN( 0x0 ),
 	MC( SPR_BTSUS_ROAD_X_REAR_TILE_B ), MC( SPR_BTSUS_X_FRONT_TILE_B ),   MC( SPR_BTSUS_X_PILLAR_TILE_B ),   MN( 0x0 ),
@ -421,7 +421,7 @@ static const PalSpriteID _bridge_sprite_table_concrete_suspended_B[] = {
 	MC( SPR_BTSUS_MGLV_Y_REAR_TILE_B ), MC( SPR_BTSUS_Y_FRONT_TILE_B ),   MC( SPR_BTSUS_Y_PILLAR_TILE_B ),   MN( 0x0 ),
 };

-static const PalSpriteID _bridge_sprite_table_concrete_suspended_C[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_concrete_inner_north[] = {
 	MC( SPR_BTSUS_RAIL_X_REAR_TILE_C ), MC( SPR_BTSUS_X_FRONT_TILE_C ),   MC( SPR_BTSUS_X_PILLAR_TILE_C ),   MN( 0x0 ),
 	MC( SPR_BTSUS_RAIL_Y_REAR_TILE_C ), MC( SPR_BTSUS_Y_FRONT_TILE_C ),   MC( SPR_BTSUS_Y_PILLAR_TILE_C ),   MN( 0x0 ),
 	MC( SPR_BTSUS_ROAD_X_REAR_TILE_C ), MC( SPR_BTSUS_X_FRONT_TILE_C ),   MC( SPR_BTSUS_X_PILLAR_TILE_C ),   MN( 0x0 ),
@ -432,7 +432,7 @@ static const PalSpriteID _bridge_sprite_table_concrete_suspended_C[] = {
 	MC( SPR_BTSUS_MGLV_Y_REAR_TILE_C ), MC( SPR_BTSUS_Y_FRONT_TILE_C ),   MC( SPR_BTSUS_Y_PILLAR_TILE_C ),   MN( 0x0 ),
 };

-static const PalSpriteID _bridge_sprite_table_concrete_suspended_D[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_concrete_inner_south[] = {
 	MC( SPR_BTSUS_RAIL_X_REAR_TILE_D ), MC( SPR_BTSUS_X_FRONT_TILE_D ),   MC( SPR_BTSUS_X_PILLAR_TILE_D ),   MN( 0x0 ),
 	MC( SPR_BTSUS_RAIL_Y_REAR_TILE_D ), MC( SPR_BTSUS_Y_FRONT_TILE_D ),   MC( SPR_BTSUS_Y_PILLAR_TILE_D ),   MN( 0x0 ),
 	MC( SPR_BTSUS_ROAD_X_REAR_TILE_D ), MC( SPR_BTSUS_X_FRONT_TILE_D ),   MC( SPR_BTSUS_X_PILLAR_TILE_D ),   MN( 0x0 ),
@ -443,7 +443,7 @@ static const PalSpriteID _bridge_sprite_table_concrete_suspended_D[] = {
 	MC( SPR_BTSUS_MGLV_Y_REAR_TILE_D ), MC( SPR_BTSUS_Y_FRONT_TILE_D ),   MC( SPR_BTSUS_Y_PILLAR_TILE_D ),   MN( 0x0 ),
 };

-static const PalSpriteID _bridge_sprite_table_concrete_suspended_E[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_concrete_middle_odd[] = {
 	MC( SPR_BTSUS_RAIL_X_REAR_TILE_E ), MC( SPR_BTSUS_X_FRONT_TILE_E ),   MC( SPR_BTSUS_X_PILLAR_TILE_E ),   MN( 0x0 ),
 	MC( SPR_BTSUS_RAIL_Y_REAR_TILE_E ), MC( SPR_BTSUS_Y_FRONT_TILE_E ),   MC( SPR_BTSUS_Y_PILLAR_TILE_E ),   MN( 0x0 ),
 	MC( SPR_BTSUS_ROAD_X_REAR_TILE_E ), MC( SPR_BTSUS_X_FRONT_TILE_E ),   MC( SPR_BTSUS_X_PILLAR_TILE_E ),   MN( 0x0 ),
@ -454,7 +454,7 @@ static const PalSpriteID _bridge_sprite_table_concrete_suspended_E[] = {
 	MC( SPR_BTSUS_MGLV_Y_REAR_TILE_E ), MC( SPR_BTSUS_Y_FRONT_TILE_E ),   MC( SPR_BTSUS_Y_PILLAR_TILE_E ),   MN( 0x0 ),
 };

-static const PalSpriteID _bridge_sprite_table_concrete_suspended_F[] = {
+static const PalSpriteID _bridge_sprite_table_suspension_concrete_middle_even[] = {
 	MC( SPR_BTSUS_RAIL_X_REAR_TILE_F ), MC( SPR_BTSUS_X_FRONT ),          MN( 0x0 ),                         MN( 0x0 ),
 	MC( SPR_BTSUS_RAIL_Y_REAR_TILE_F ), MC( SPR_BTSUS_Y_FRONT ),          MN( 0x0 ),                         MN( 0x0 ),
 	MC( SPR_BTSUS_ROAD_X_REAR_TILE_F ), MC( SPR_BTSUS_X_FRONT ),          MN( 0x0 ),                         MN( 0x0 ),
@ -465,7 +465,7 @@ static const PalSpriteID _bridge_sprite_table_concrete_suspended_F[] = {
 	MC( SPR_BTSUS_MGLV_Y_REAR_TILE_F ), MC( SPR_BTSUS_Y_FRONT ),          MN( 0x0 ),                         MN( 0x0 ),
 };

-static const PalSpriteID _bridge_sprite_table_concrete_suspended_heads[] = {
+static const PalSpriteID _bridge_sprite_table_generic_concrete_heads[] = {
 	MN( SPR_BTGEN_RAIL_X_SLOPE_UP  ),   MN( SPR_BTGEN_RAIL_Y_SLOPE_UP  ), MN( SPR_BTGEN_RAIL_X_SLOPE_DOWN ), MN( SPR_BTGEN_RAIL_Y_SLOPE_DOWN ),
 	MN( SPR_BTGEN_RAIL_RAMP_X_DOWN ),   MN( SPR_BTGEN_RAIL_RAMP_Y_DOWN ), MN( SPR_BTGEN_RAIL_RAMP_X_UP    ), MN( SPR_BTGEN_RAIL_RAMP_Y_UP    ),
 	MC( SPR_BTGEN_ROAD_X_SLOPE_UP  ),   MC( SPR_BTGEN_ROAD_Y_SLOPE_UP  ), MC( SPR_BTGEN_ROAD_X_SLOPE_DOWN ), MC( SPR_BTGEN_ROAD_Y_SLOPE_DOWN ),
@ -476,7 +476,7 @@ static const PalSpriteID _bridge_sprite_table_concrete_suspended_heads[] = {
 	MC( SPR_BTGEN_MGLV_RAMP_X_DOWN ),   MC( SPR_BTGEN_MGLV_RAMP_Y_DOWN ), MC( SPR_BTGEN_MGLV_RAMP_X_UP    ), MC( SPR_BTGEN_MGLV_RAMP_Y_UP    ),
 };

-static const PalSpriteID _bridge_sprite_table_9_0[] = {
+static const PalSpriteID _bridge_sprite_table_girder_middle[] = {
 	{  0x9F9, PAL_NONE }, {  0x9FD, PAL_NONE }, {  0x9C9, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9FA, PAL_NONE }, {  0x9FE, PAL_NONE }, {  0x9CA, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0x9FB, PAL_NONE }, {  0x9FD, PAL_NONE }, {  0x9C9, PAL_NONE }, {    0x0, PAL_NONE },
@ -487,7 +487,7 @@ static const PalSpriteID _bridge_sprite_table_9_0[] = {
 	{ 0x1133, PAL_NONE }, {  0x9FE, PAL_NONE }, {  0x9CA, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_10_0[] = {
+static const PalSpriteID _bridge_sprite_table_tubular_oxide_north[] = {
 	{  0xA0B, PAL_NONE }, {  0xA01, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0xA0C, PAL_NONE }, {  0xA02, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0xA11, PAL_NONE }, {  0xA01, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
@ -498,7 +498,7 @@ static const PalSpriteID _bridge_sprite_table_10_0[] = {
 	{  0xA1E, PAL_NONE }, {  0xA02, PAL_NONE }, {    0x0, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_10_1[] = {
+static const PalSpriteID _bridge_sprite_table_tubular_oxide_south[] = {
 	{  0xA09, PAL_NONE }, {  0x9FF, PAL_NONE }, {  0xA05, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0xA0E, PAL_NONE }, {  0xA04, PAL_NONE }, {  0xA08, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0xA0F, PAL_NONE }, {  0x9FF, PAL_NONE }, {  0xA05, PAL_NONE }, {    0x0, PAL_NONE },
@ -509,7 +509,7 @@ static const PalSpriteID _bridge_sprite_table_10_1[] = {
 	{  0xA20, PAL_NONE }, {  0xA04, PAL_NONE }, {  0xA08, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_10_2[] = {
+static const PalSpriteID _bridge_sprite_table_tubular_oxide_middle[] = {
 	{  0xA0A, PAL_NONE }, {  0xA00, PAL_NONE }, {  0xA06, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0xA0D, PAL_NONE }, {  0xA03, PAL_NONE }, {  0xA07, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0xA10, PAL_NONE }, {  0xA00, PAL_NONE }, {  0xA06, PAL_NONE }, {    0x0, PAL_NONE },
@ -520,7 +520,7 @@ static const PalSpriteID _bridge_sprite_table_10_2[] = {
 	{  0xA1F, PAL_NONE }, {  0xA03, PAL_NONE }, {  0xA07, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_11_0[] = {
+static const PalSpriteID _bridge_sprite_table_tubular_yellow_north[] = {
 	{  0xA0B, PALETTE_TO_STRUCT_YELLOW }, {     0xA01, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0xA0C, PALETTE_TO_STRUCT_YELLOW }, {     0xA02, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0xA11, PALETTE_TO_STRUCT_YELLOW }, {     0xA01, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE }, {    0x0, PAL_NONE },
@ -531,7 +531,7 @@ static const PalSpriteID _bridge_sprite_table_11_0[] = {
 	{  0xA1E, PALETTE_TO_STRUCT_YELLOW }, {     0xA02, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_11_1[] = {
+static const PalSpriteID _bridge_sprite_table_tubular_yellow_south[] = {
 	{  0xA09, PALETTE_TO_STRUCT_YELLOW }, {     0x9FF, PALETTE_TO_STRUCT_YELLOW }, {     0xA05, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0xA0E, PALETTE_TO_STRUCT_YELLOW }, {     0xA04, PALETTE_TO_STRUCT_YELLOW }, {     0xA08, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0xA0F, PALETTE_TO_STRUCT_YELLOW }, {     0x9FF, PALETTE_TO_STRUCT_YELLOW }, {     0xA05, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
@ -542,7 +542,7 @@ static const PalSpriteID _bridge_sprite_table_11_1[] = {
 	{  0xA20, PALETTE_TO_STRUCT_YELLOW }, {     0xA04, PALETTE_TO_STRUCT_YELLOW }, {     0xA08, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_11_2[] = {
+static const PalSpriteID _bridge_sprite_table_tubular_yellow_middle[] = {
 	{  0xA0A, PALETTE_TO_STRUCT_YELLOW }, {     0xA00, PALETTE_TO_STRUCT_YELLOW }, {     0xA06, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0xA0D, PALETTE_TO_STRUCT_YELLOW }, {     0xA03, PALETTE_TO_STRUCT_YELLOW }, {     0xA07, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 	{  0xA10, PALETTE_TO_STRUCT_YELLOW }, {     0xA00, PALETTE_TO_STRUCT_YELLOW }, {     0xA06, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
@ -553,7 +553,7 @@ static const PalSpriteID _bridge_sprite_table_11_2[] = {
 	{  0xA1F, PALETTE_TO_STRUCT_YELLOW }, {     0xA03, PALETTE_TO_STRUCT_YELLOW }, {     0xA07, PALETTE_TO_STRUCT_YELLOW }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_12_0[] = {
+static const PalSpriteID _bridge_sprite_table_tubular_silicon_north[] = {
 	{  0xA0B, PALETTE_TO_STRUCT_CONCRETE }, {     0xA01, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0xA0C, PALETTE_TO_STRUCT_CONCRETE }, {     0xA02, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE }, {    0x0, PAL_NONE },
 	{  0xA11, PALETTE_TO_STRUCT_CONCRETE }, {     0xA01, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE }, {    0x0, PAL_NONE },
@ -564,7 +564,7 @@ static const PalSpriteID _bridge_sprite_table_12_0[] = {
 	{  0xA1E, PALETTE_TO_STRUCT_CONCRETE }, {     0xA02, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE }, {    0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_12_1[] = {
+static const PalSpriteID _bridge_sprite_table_tubular_silicon_south[] = {
 	{  0xA09, PALETTE_TO_STRUCT_CONCRETE }, {     0x9FF, PALETTE_TO_STRUCT_CONCRETE }, {     0xA05, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE },
 	{  0xA0E, PALETTE_TO_STRUCT_CONCRETE }, {     0xA04, PALETTE_TO_STRUCT_CONCRETE }, {     0xA08, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE },
 	{  0xA0F, PALETTE_TO_STRUCT_CONCRETE }, {     0x9FF, PALETTE_TO_STRUCT_CONCRETE }, {     0xA05, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE },
@ -575,7 +575,7 @@ static const PalSpriteID _bridge_sprite_table_12_1[] = {
 	{  0xA20, PALETTE_TO_STRUCT_CONCRETE }, {     0xA04, PALETTE_TO_STRUCT_CONCRETE }, {     0xA08, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE },
 };

-static const PalSpriteID _bridge_sprite_table_12_2[] = {
+static const PalSpriteID _bridge_sprite_table_tubular_silicon_middle[] = {
 	{  0xA0A, PALETTE_TO_STRUCT_CONCRETE }, {     0xA00, PALETTE_TO_STRUCT_CONCRETE }, {     0xA06, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE },
 	{  0xA0D, PALETTE_TO_STRUCT_CONCRETE }, {     0xA03, PALETTE_TO_STRUCT_CONCRETE }, {     0xA07, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE },
 	{  0xA10, PALETTE_TO_STRUCT_CONCRETE }, {     0xA00, PALETTE_TO_STRUCT_CONCRETE }, {     0xA06, PALETTE_TO_STRUCT_CONCRETE }, {       0x0, PAL_NONE },
@ -596,64 +596,64 @@ static const std::span<const PalSpriteID> _bridge_sprite_table_archgirder[] = {
 	_bridge_sprite_table_archgirder_heads,
 };

-static const std::span<const PalSpriteID> _bridge_sprite_table_4[] = {
-	_bridge_sprite_table_4_0,
-	_bridge_sprite_table_4_1,
-	_bridge_sprite_table_4_2,
-	_bridge_sprite_table_4_3,
-	_bridge_sprite_table_4_4,
-	_bridge_sprite_table_4_5,
-	_bridge_sprite_table_4_6,
+static const std::span<const PalSpriteID> _bridge_sprite_table_suspension_oxide[] = {
+	_bridge_sprite_table_suspension_oxide_north,
+	_bridge_sprite_table_suspension_oxide_south,
+	_bridge_sprite_table_suspension_oxide_inner_north,
+	_bridge_sprite_table_suspension_oxide_inner_south,
+	_bridge_sprite_table_suspension_oxide_middle_odd,
+	_bridge_sprite_table_suspension_middle_even,
+	_bridge_sprite_table_generic_oxide_heads,
 };

-static const std::span<const PalSpriteID> _bridge_sprite_table_5[] = {
-	_bridge_sprite_table_5_0,
-	_bridge_sprite_table_5_1,
-	_bridge_sprite_table_5_2,
-	_bridge_sprite_table_5_3,
-	_bridge_sprite_table_5_4,
-	_bridge_sprite_table_5_5,
-	_bridge_sprite_table_5_6,
+static const std::span<const PalSpriteID> _bridge_sprite_table_suspension_yellow[] = {
+	_bridge_sprite_table_suspension_yellow_north,
+	_bridge_sprite_table_suspension_yellow_south,
+	_bridge_sprite_table_suspension_yellow_inner_north,
+	_bridge_sprite_table_suspension_yellow_inner_south,
+	_bridge_sprite_table_suspension_yellow_middle_odd,
+	_bridge_sprite_table_suspension_yellow_middle_even,
+	_bridge_sprite_table_generic_yellow_heads,
 };

-static const std::span<const PalSpriteID> _bridge_sprite_table_concrete_suspended[] = {
-	_bridge_sprite_table_concrete_suspended_A,
-	_bridge_sprite_table_concrete_suspended_B,
-	_bridge_sprite_table_concrete_suspended_C,
-	_bridge_sprite_table_concrete_suspended_D,
-	_bridge_sprite_table_concrete_suspended_E,
-	_bridge_sprite_table_concrete_suspended_F,
-	_bridge_sprite_table_concrete_suspended_heads,
+static const std::span<const PalSpriteID> _bridge_sprite_table_suspension_concrete[] = {
+	_bridge_sprite_table_suspension_concrete_north,
+	_bridge_sprite_table_suspension_concrete_south,
+	_bridge_sprite_table_suspension_concrete_inner_north,
+	_bridge_sprite_table_suspension_concrete_inner_south,
+	_bridge_sprite_table_suspension_concrete_middle_odd,
+	_bridge_sprite_table_suspension_concrete_middle_even,
+	_bridge_sprite_table_generic_concrete_heads,
 };

-static const std::span<const PalSpriteID> _bridge_sprite_table_6[] = {
-	_bridge_sprite_table_6_0,
-	_bridge_sprite_table_6_1,
-	_bridge_sprite_table_6_2,
-	_bridge_sprite_table_6_2,
-	_bridge_sprite_table_6_2,
-	_bridge_sprite_table_6_2,
-	_bridge_sprite_table_6_3,
+static const std::span<const PalSpriteID> _bridge_sprite_table_cantilever_oxide[] = {
+	_bridge_sprite_table_cantilever_oxide_north,
+	_bridge_sprite_table_cantilever_oxide_south,
+	_bridge_sprite_table_cantilever_oxide_middle,
+	_bridge_sprite_table_cantilever_oxide_middle,
+	_bridge_sprite_table_cantilever_oxide_middle,
+	_bridge_sprite_table_cantilever_oxide_middle,
+	_bridge_sprite_table_cantilever_oxide_heads,
 };

-static const std::span<const PalSpriteID> _bridge_sprite_table_7[] = {
-	_bridge_sprite_table_7_0,
-	_bridge_sprite_table_7_1,
-	_bridge_sprite_table_7_2,
-	_bridge_sprite_table_7_2,
-	_bridge_sprite_table_7_2,
-	_bridge_sprite_table_7_2,
-	_bridge_sprite_table_7_3,
+static const std::span<const PalSpriteID> _bridge_sprite_table_cantilever_brown[] = {
+	_bridge_sprite_table_cantilever_brown_north,
+	_bridge_sprite_table_cantilever_brown_south,
+	_bridge_sprite_table_cantilever_brown_middle,
+	_bridge_sprite_table_cantilever_brown_middle,
+	_bridge_sprite_table_cantilever_brown_middle,
+	_bridge_sprite_table_cantilever_brown_middle,
+	_bridge_sprite_table_cantilever_brown_heads,
 };

-static const std::span<const PalSpriteID> _bridge_sprite_table_8[] = {
-	_bridge_sprite_table_8_0,
-	_bridge_sprite_table_8_1,
-	_bridge_sprite_table_8_2,
-	_bridge_sprite_table_8_2,
-	_bridge_sprite_table_8_2,
-	_bridge_sprite_table_8_2,
-	_bridge_sprite_table_8_3,
+static const std::span<const PalSpriteID> _bridge_sprite_table_cantilever_red[] = {
+	_bridge_sprite_table_cantilever_red_north,
+	_bridge_sprite_table_cantilever_red_south,
+	_bridge_sprite_table_cantilever_red_middle,
+	_bridge_sprite_table_cantilever_red_middle,
+	_bridge_sprite_table_cantilever_red_middle,
+	_bridge_sprite_table_cantilever_red_middle,
+	_bridge_sprite_table_cantilever_red_heads,
 };

 static const std::span<const PalSpriteID> _bridge_sprite_table_wood[] = {
@ -676,60 +676,60 @@ static const std::span<const PalSpriteID> _bridge_sprite_table_concrete[] = {
 	_bridge_sprite_table_concrete_heads,
 };

-static const std::span<const PalSpriteID> _bridge_sprite_table_9[] = {
-	_bridge_sprite_table_9_0,
-	_bridge_sprite_table_9_0,
-	_bridge_sprite_table_9_0,
-	_bridge_sprite_table_9_0,
-	_bridge_sprite_table_9_0,
-	_bridge_sprite_table_9_0,
-	_bridge_sprite_table_4_6,
+static const std::span<const PalSpriteID> _bridge_sprite_table_girder[] = {
+	_bridge_sprite_table_girder_middle,
+	_bridge_sprite_table_girder_middle,
+	_bridge_sprite_table_girder_middle,
+	_bridge_sprite_table_girder_middle,
+	_bridge_sprite_table_girder_middle,
+	_bridge_sprite_table_girder_middle,
+	_bridge_sprite_table_generic_oxide_heads,
 };

-static const std::span<const PalSpriteID> _bridge_sprite_table_10[] = {
-	_bridge_sprite_table_10_0,
-	_bridge_sprite_table_10_1,
-	_bridge_sprite_table_10_2,
-	_bridge_sprite_table_10_2,
-	_bridge_sprite_table_10_2,
-	_bridge_sprite_table_10_2,
-	_bridge_sprite_table_4_6,
+static const std::span<const PalSpriteID> _bridge_sprite_table_tubular_oxide[] = {
+	_bridge_sprite_table_tubular_oxide_north,
+	_bridge_sprite_table_tubular_oxide_south,
+	_bridge_sprite_table_tubular_oxide_middle,
+	_bridge_sprite_table_tubular_oxide_middle,
+	_bridge_sprite_table_tubular_oxide_middle,
+	_bridge_sprite_table_tubular_oxide_middle,
+	_bridge_sprite_table_generic_oxide_heads,
 };

-static const std::span<const PalSpriteID> _bridge_sprite_table_11[] = {
-	_bridge_sprite_table_11_0,
-	_bridge_sprite_table_11_1,
-	_bridge_sprite_table_11_2,
-	_bridge_sprite_table_11_2,
-	_bridge_sprite_table_11_2,
-	_bridge_sprite_table_11_2,
-	_bridge_sprite_table_5_6,
+static const std::span<const PalSpriteID> _bridge_sprite_table_tubular_yellow[] = {
+	_bridge_sprite_table_tubular_yellow_north,
+	_bridge_sprite_table_tubular_yellow_south,
+	_bridge_sprite_table_tubular_yellow_middle,
+	_bridge_sprite_table_tubular_yellow_middle,
+	_bridge_sprite_table_tubular_yellow_middle,
+	_bridge_sprite_table_tubular_yellow_middle,
+	_bridge_sprite_table_generic_yellow_heads,
 };

-static const std::span<const PalSpriteID> _bridge_sprite_table_12[] = {
-	_bridge_sprite_table_12_0,
-	_bridge_sprite_table_12_1,
-	_bridge_sprite_table_12_2,
-	_bridge_sprite_table_12_2,
-	_bridge_sprite_table_12_2,
-	_bridge_sprite_table_12_2,
-	_bridge_sprite_table_concrete_suspended_heads,
+static const std::span<const PalSpriteID> _bridge_sprite_table_tubular_silicon[] = {
+	_bridge_sprite_table_tubular_silicon_north,
+	_bridge_sprite_table_tubular_silicon_south,
+	_bridge_sprite_table_tubular_silicon_middle,
+	_bridge_sprite_table_tubular_silicon_middle,
+	_bridge_sprite_table_tubular_silicon_middle,
+	_bridge_sprite_table_tubular_silicon_middle,
+	_bridge_sprite_table_generic_concrete_heads,
 };

 static const std::span<const std::span<const PalSpriteID>> _bridge_sprite_table[MAX_BRIDGES] = {
 	_bridge_sprite_table_wood,
 	_bridge_sprite_table_concrete,
 	_bridge_sprite_table_archgirder,
-	_bridge_sprite_table_concrete_suspended,
-	_bridge_sprite_table_4,
-	_bridge_sprite_table_5,
-	_bridge_sprite_table_6,
-	_bridge_sprite_table_7,
-	_bridge_sprite_table_8,
-	_bridge_sprite_table_9,
-	_bridge_sprite_table_10,
-	_bridge_sprite_table_11,
-	_bridge_sprite_table_12
+	_bridge_sprite_table_suspension_concrete,
+	_bridge_sprite_table_suspension_oxide,
+	_bridge_sprite_table_suspension_yellow,
+	_bridge_sprite_table_cantilever_oxide,
+	_bridge_sprite_table_cantilever_brown,
+	_bridge_sprite_table_cantilever_red,
+	_bridge_sprite_table_girder,
+	_bridge_sprite_table_tubular_oxide,
+	_bridge_sprite_table_tubular_yellow,
+	_bridge_sprite_table_tubular_silicon,
 };

 /**
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@ -621,7 +621,7 @@ struct ScenarioEditorLandscapeGenerationWindow : Window {
 				if (!IsInsideMM(size, 1, 8 + 1)) return;
 				_terraform_size = size;

-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				break;
 			}
--- a/src/tile_map.cpp
+++ b/src/tile_map.cpp
@ -120,12 +120,14 @@ int GetTileZ(TileIndex tile)
 	uint x2 = std::min(x1 + 1, Map::MaxX());
 	uint y2 = std::min(y1 + 1, Map::MaxY());

-	return std::min({
-		TileHeight(tile),           // N corner
-		TileHeight(TileXY(x2, y1)), // W corner
-		TileHeight(TileXY(x1, y2)), // E corner
-		TileHeight(TileXY(x2, y2)), // S corner
-	});
+	return std::min(
+		std::min(
+			TileHeight(tile),            // N corner
+			TileHeight(TileXY(x2, y1))), // W corner
+		std::min(
+			TileHeight(TileXY(x1, y2)),  // E corner
+			TileHeight(TileXY(x2, y2)))  // S corner
+	);
 }

 /**
@ -140,10 +142,12 @@ int GetTileMaxZ(TileIndex t)
 	uint x2 = std::min(x1 + 1, Map::MaxX());
 	uint y2 = std::min(y1 + 1, Map::MaxY());

-	return std::max({
-		TileHeight(t),              // N corner
-		TileHeight(TileXY(x2, y1)), // W corner
-		TileHeight(TileXY(x1, y2)), // E corner
-		TileHeight(TileXY(x2, y2)), // S corner
-	});
+	return std::max(
+		std::max(
+			TileHeight(t),               // N corner
+			TileHeight(TileXY(x2, y1))), // W corner
+		std::max(
+			TileHeight(TileXY(x1, y2)),  // E corner
+			TileHeight(TileXY(x2, y2)))  // S corner
+	);
 }
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@ -117,7 +117,7 @@ public:
 static void PopupMainToolbarMenu(Window *w, WidgetID widget, DropDownList &&list, int def)
 {
 	ShowDropDownList(w, std::move(list), def, widget, 0, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 }

 /**
@ -204,7 +204,7 @@ static CallBackFunction ToolbarPauseClick(Window *)
 	if (_networking && !_network_server) return CBF_NONE; // only server can pause the game

 	if (Command<CMD_PAUSE>::Post(PauseMode::Normal, _pause_mode.None())) {
-		if (_settings_client.sound.confirm) SndPlayFx(SND_15_BEEP);
+		SndConfirmBeep();
 	}
 	return CBF_NONE;
 }
@ -220,7 +220,7 @@ static CallBackFunction ToolbarFastForwardClick(Window *)

 	ChangeGameSpeed(_game_speed == 100);

-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -291,7 +291,7 @@ static CallBackFunction ToolbarOptionsClick(Window *w)
 	list.push_back(MakeDropDownListCheckedItem(IsTransparencySet(TO_SIGNS), STR_SETTINGS_MENU_TRANSPARENT_SIGNS, OME_SHOW_STATIONSIGNS));

 	ShowDropDownList(w, std::move(list), 0, WID_TN_SETTINGS, 140, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -684,7 +684,7 @@ static CallBackFunction ToolbarGraphsClick(Window *w)
 	if (_toolbar_mode != TB_NORMAL) AddDropDownLeagueTableOptions(list);

 	ShowDropDownList(w, std::move(list), GRMN_OPERATING_PROFIT_GRAPH, WID_TN_GRAPHS, 140, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();

 	return CBF_NONE;
 }
@ -697,7 +697,7 @@ static CallBackFunction ToolbarLeagueClick(Window *w)

 	int selected = list[0]->result;
 	ShowDropDownList(w, std::move(list), selected, WID_TN_LEAGUE, 140, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();

 	return CBF_NONE;
 }
@ -857,7 +857,7 @@ static CallBackFunction ToolbarZoomInClick(Window *w)
 {
 	if (DoZoomInOutWindow(ZOOM_IN, GetMainWindow())) {
 		w->HandleButtonClick((_game_mode == GM_EDITOR) ? (WidgetID)WID_TE_ZOOM_IN : (WidgetID)WID_TN_ZOOM_IN);
-		if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+		SndClickBeep();
 	}
 	return CBF_NONE;
 }
@ -868,7 +868,7 @@ static CallBackFunction ToolbarZoomOutClick(Window *w)
 {
 	if (DoZoomInOutWindow(ZOOM_OUT, GetMainWindow())) {
 		w->HandleButtonClick((_game_mode == GM_EDITOR) ? (WidgetID)WID_TE_ZOOM_OUT : (WidgetID)WID_TN_ZOOM_OUT);
-		if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+		SndClickBeep();
 	}
 	return CBF_NONE;
 }
@ -878,7 +878,7 @@ static CallBackFunction ToolbarZoomOutClick(Window *w)
 static CallBackFunction ToolbarBuildRailClick(Window *w)
 {
 	ShowDropDownList(w, GetRailTypeDropDownList(), _last_built_railtype, WID_TN_RAILS, 140, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -900,7 +900,7 @@ static CallBackFunction MenuClickBuildRail(int index)
 static CallBackFunction ToolbarBuildRoadClick(Window *w)
 {
 	ShowDropDownList(w, GetRoadTypeDropDownList(RTTB_ROAD), _last_built_roadtype, WID_TN_ROADS, 140, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -922,7 +922,7 @@ static CallBackFunction MenuClickBuildRoad(int index)
 static CallBackFunction ToolbarBuildTramClick(Window *w)
 {
 	ShowDropDownList(w, GetRoadTypeDropDownList(RTTB_TRAM), _last_built_tramtype, WID_TN_TRAMS, 140, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -946,7 +946,7 @@ static CallBackFunction ToolbarBuildWaterClick(Window *w)
 	DropDownList list;
 	list.push_back(MakeDropDownListIconItem(SPR_IMG_BUILD_CANAL, PAL_NONE, STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION, 0));
 	ShowDropDownList(w, std::move(list), 0, WID_TN_WATER, 140, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -968,7 +968,7 @@ static CallBackFunction ToolbarBuildAirClick(Window *w)
 	DropDownList list;
 	list.push_back(MakeDropDownListIconItem(SPR_IMG_AIRPORT, PAL_NONE, STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION, 0));
 	ShowDropDownList(w, std::move(list), 0, WID_TN_AIR, 140, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -992,7 +992,7 @@ static CallBackFunction ToolbarForestClick(Window *w)
 	list.push_back(MakeDropDownListIconItem(SPR_IMG_PLANTTREES, PAL_NONE, STR_LANDSCAPING_MENU_PLANT_TREES, 1));
 	list.push_back(MakeDropDownListIconItem(SPR_IMG_SIGN, PAL_NONE, STR_LANDSCAPING_MENU_PLACE_SIGN, 2));
 	ShowDropDownList(w, std::move(list), 0, WID_TN_LANDSCAPE, 100, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -1188,7 +1188,7 @@ static CallBackFunction ToolbarSwitchClick(Window *w)

 	w->ReInit();
 	w->SetWidgetLoweredState(_game_mode == GM_EDITOR ? (WidgetID)WID_TE_SWITCH_BAR : (WidgetID)WID_TN_SWITCH_BAR, _toolbar_mode == TB_LOWER);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -1232,7 +1232,7 @@ static CallBackFunction ToolbarScenDateForward(Window *w)
 static CallBackFunction ToolbarScenGenLand(Window *w)
 {
 	w->HandleButtonClick(WID_TE_LAND_GENERATE);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();

 	ShowEditorTerraformToolbar();
 	return CBF_NONE;
@ -1256,7 +1256,7 @@ static CallBackFunction ToolbarScenGenTown(int index)
 static CallBackFunction ToolbarScenGenIndustry(Window *w)
 {
 	w->HandleButtonClick(WID_TE_INDUSTRY);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	ShowBuildIndustryWindow();
 	return CBF_NONE;
 }
@ -1264,7 +1264,7 @@ static CallBackFunction ToolbarScenGenIndustry(Window *w)
 static CallBackFunction ToolbarScenBuildRoadClick(Window *w)
 {
 	ShowDropDownList(w, GetScenRoadTypeDropDownList(RTTB_ROAD), _last_built_roadtype, WID_TE_ROADS, 140, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -1284,7 +1284,7 @@ static CallBackFunction ToolbarScenBuildRoad(int index)
 static CallBackFunction ToolbarScenBuildTramClick(Window *w)
 {
 	ShowDropDownList(w, GetScenRoadTypeDropDownList(RTTB_TRAM), _last_built_tramtype, WID_TE_TRAMS, 140, true);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return CBF_NONE;
 }

@ -1304,7 +1304,7 @@ static CallBackFunction ToolbarScenBuildTram(int index)
 static CallBackFunction ToolbarScenBuildDocks(Window *w)
 {
 	w->HandleButtonClick(WID_TE_WATER);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	ShowBuildDocksScenToolbar();
 	return CBF_NONE;
 }
@ -1312,7 +1312,7 @@ static CallBackFunction ToolbarScenBuildDocks(Window *w)
 static CallBackFunction ToolbarScenPlantTrees(Window *w)
 {
 	w->HandleButtonClick(WID_TE_TREES);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	ShowBuildTreesToolbar();
 	return CBF_NONE;
 }
@ -1320,7 +1320,7 @@ static CallBackFunction ToolbarScenPlantTrees(Window *w)
 static CallBackFunction ToolbarScenPlaceSign(Window *w)
 {
 	w->HandleButtonClick(WID_TE_SIGNS);
-	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+	SndClickBeep();
 	return SelectSignTool();
 }

@ -2407,7 +2407,7 @@ struct ScenarioEditorToolbarWindow : Window {
 	{
 		CallBackFunction cbf = _scen_toolbar_dropdown_procs[widget](index);
 		if (cbf != CBF_NONE) _last_started_action = cbf;
-		if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+		SndClickBeep();
 	}

 	EventState OnHotkey(int hotkey) override
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@ -1739,7 +1739,7 @@ struct BuildHouseWindow : public PickerWindow {
 				this->SetWidgetLoweredState(WID_BH_PROTECT_OFF, !BuildHouseWindow::house_protected);
 				this->SetWidgetLoweredState(WID_BH_PROTECT_ON, BuildHouseWindow::house_protected);

-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				this->SetDirty();
 				break;

--- a/src/transparency_gui.cpp
+++ b/src/transparency_gui.cpp
@ -80,7 +80,7 @@ public:
 			} else {
 				/* toggle the bit of the transparencies variable and play a sound */
 				ToggleTransparency((TransparencyOption)(widget - WID_TT_BEGIN));
-				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				SndClickBeep();
 				MarkWholeScreenDirty();
 			}
 		} else if (widget == WID_TT_BUTTONS) {
@ -94,7 +94,7 @@ public:
 			if (i == WID_TT_TEXT|| i == WID_TT_END) return;

 			ToggleInvisibility((TransparencyOption)(i - WID_TT_BEGIN));
-			if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+			SndClickBeep();

 			/* Redraw whole screen only if transparency is set */
 			if (IsTransparencySet((TransparencyOption)(i - WID_TT_BEGIN))) {
--- a/src/tree_gui.cpp
+++ b/src/tree_gui.cpp
@ -102,7 +102,7 @@ class BuildTreesWindow : public Window

 		if (this->tree_to_plant >= 0) {
 			/* Activate placement */
-			if (_settings_client.sound.confirm) SndPlayFx(SND_15_BEEP);
+			SndConfirmBeep();
 			SetObjectToPlace(SPR_CURSOR_TREE, PAL_NONE, HT_RECT | HT_DIAGONAL, this->window_class, this->window_number);
 			this->tree_to_plant = current_tree; // SetObjectToPlace may call ResetObjectToPlace which may reset tree_to_plant to -1
 		} else {
@ -180,7 +180,7 @@ public:
 				break;

 			case WID_BT_MANY_RANDOM: // place trees randomly over the landscape
-				if (_settings_client.sound.confirm) SndPlayFx(SND_15_BEEP);
+				SndConfirmBeep();
 				PlaceTreesRandomly();
 				MarkWholeScreenDirty();
 				break;
Author	SHA1	Message	Date
SamuXarick	b6a0411eee	Merge `38462627db` into `614a01907a`	2025-07-27 20:54:40 +00:00
Peter Nelson	614a01907a	Codechange: Make functions for click and confirm beeps. (#14484 ) Avoids repetition.	2025-07-27 21:54:32 +01:00
Peter Nelson	f51067f9f5	Codechange: Give all bridge sprite tables descriptive names. (#14483 ) Finish off the work started 17 years ago...	2025-07-27 20:14:37 +01:00
SamuXarick	38462627db	Codechange: 3 steps of std::min/max with 2 elements are faster than 1 single step with 4	2025-01-02 15:55:42 +00:00