mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: Pass bridge type instead of display row to BuildBridge. (#10828)

This commit is contained in:
PeterN 2023-05-14 20:12:26 +01:00 committed by GitHub
parent a8daf91eea
commit 4894da67da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bridge_gui.cpp
View File

@ -106,15 +106,15 @@ private:
return a.spec->speed < b.spec->speed; return a.spec->speed < b.spec->speed;
} }
void BuildBridge(uint8 i) void BuildBridge(BridgeType type)
{ {
switch (this->transport_type) { switch (this->transport_type) {
case TRANSPORT_RAIL: _last_railbridge_type = this->bridges.at(i).index; break; case TRANSPORT_RAIL: _last_railbridge_type = type; break;
case TRANSPORT_ROAD: _last_roadbridge_type = this->bridges.at(i).index; break; case TRANSPORT_ROAD: _last_roadbridge_type = type; break;
default: break; default: break;
} }
Command<CMD_BUILD_BRIDGE>::Post(STR_ERROR_CAN_T_BUILD_BRIDGE_HERE, CcBuildBridge, Command<CMD_BUILD_BRIDGE>::Post(STR_ERROR_CAN_T_BUILD_BRIDGE_HERE, CcBuildBridge,
this->end_tile, this->start_tile, this->transport_type, this->bridges.at(i).index, this->road_rail_type); this->end_tile, this->start_tile, this->transport_type, type, this->road_rail_type);
} }
/** Sort the builable bridges */ /** Sort the builable bridges */
@ -250,7 +250,7 @@ public:
const uint8 i = keycode - '1'; const uint8 i = keycode - '1';
if (i < 9 && i < this->bridges.size()) { if (i < 9 && i < this->bridges.size()) {
/* Build the requested bridge */ /* Build the requested bridge */
this->BuildBridge(i); this->BuildBridge(this->bridges[i].index);
this->Close(); this->Close();
return ES_HANDLED; return ES_HANDLED;
} }
@ -264,7 +264,7 @@ public:
case WID_BBS_BRIDGE_LIST: { case WID_BBS_BRIDGE_LIST: {
auto it = this->vscroll->GetScrolledItemFromWidget(this->bridges, pt.y, this, WID_BBS_BRIDGE_LIST); auto it = this->vscroll->GetScrolledItemFromWidget(this->bridges, pt.y, this, WID_BBS_BRIDGE_LIST);
if (it != this->bridges.end()) { if (it != this->bridges.end()) {
this->BuildBridge(it - this->bridges.begin()); this->BuildBridge(it->index);
this->Close(); this->Close();
} }
break; break;