miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix joininig deleted stations with improved join

Browse Source
This commit is contained in:
dP
2025-12-21 01:05:05 +05:00
parent 2aaf60b38d
commit 7d202f944a
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/citymania/cm_station_gui.cpp
View File

@@ -148,14 +148,6 @@ void OnStationTileSetChange(const Station *station, bool /* adding */, StationTy
// if (station == _viewport_highlight_station) MarkCoverageAreaDirty(_viewport_highlight_station); // if (station == _viewport_highlight_station) MarkCoverageAreaDirty(_viewport_highlight_station);
} }
void OnStationDeleted(const Station *station) {
// TODO
// if (_highlight_station_to_join == station) {
// MarkCoverageAreaDirty(station);
// _highlight_station_to_join = nullptr;
// }
}
const Station *_last_built_station; const Station *_last_built_station;
void OnStationPartBuilt(const Station *station) { void OnStationPartBuilt(const Station *station) {
_last_built_station = station; _last_built_station = station;
@@ -617,7 +609,7 @@ bool IsHighlightCoverageStation(const Station *station) {
} }
void OnStationRemoved(const Station *station) { void OnStationRemoved(const Station *station) {
// if (_last_built_station == station) _last_built_station = nullptr; if (_last_built_station == station) _last_built_station = nullptr;
if (auto mode = std::get_if<StationAction::Join>(&_station_action); mode && mode->station == station->index) { if (auto mode = std::get_if<StationAction::Join>(&_station_action); mode && mode->station == station->index) {
_station_action = StationAction::Create{}; _station_action = StationAction::Create{};
UpdateActiveTool(); UpdateActiveTool();
@@ -656,8 +648,12 @@ static void UpdateStationAction(std::optional<TileArea> area, up<Command> cmdptr
if (!area.has_value()) return; if (!area.has_value()) return;
if (UseImprovedStationJoin()) { if (UseImprovedStationJoin()) {
auto st = Station::GetIfValid(_selected_join_station);
if (st == nullptr) return;
if (st->IsInUse()) {
auto join_area = GetStationJoinArea(_selected_join_station); auto join_area = GetStationJoinArea(_selected_join_station);
if (!join_area.Intersects(*area)) return; if (!join_area.Intersects(*area)) return;
}
_station_action = StationAction::Join{_selected_join_station}; _station_action = StationAction::Join{_selected_join_station};
return; return;
} }
@@ -1063,18 +1059,19 @@ bool StationSelectAction::HandleMousePress() {
} }
void StationSelectAction::HandleMouseRelease() { void StationSelectAction::HandleMouseRelease() {
// TODO station sign click
if (!IsValidTile(this->cur_tile)) return;
_station_action = StationAction::Create{}; _station_action = StationAction::Create{};
_selected_join_station = StationID::Invalid(); _selected_join_station = StationID::Invalid();
if (IsTileType(this->cur_tile, MP_STATION)) { auto st = CheckClickOnDeadStationSign();
auto st = Station::GetByTile(this->cur_tile);
if (st) { if (st == nullptr && IsValidTile(this->cur_tile) && IsTileType(this->cur_tile, MP_STATION)) {
st = Station::GetByTile(this->cur_tile);
}
if (st == nullptr) return;
_station_action = StationAction::Join{st->index}; _station_action = StationAction::Join{st->index};
_selected_join_station = st->index; _selected_join_station = st->index;
} }
}
}
ToolGUIInfo StationSelectAction::GetGUIInfo() { ToolGUIInfo StationSelectAction::GetGUIInfo() {
if (!IsValidTile(this->cur_tile)) return {}; if (!IsValidTile(this->cur_tile)) return {};