mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: replace "magic" trick with simpler straight forward code

pull/13015/head
Rubidium 2024-10-18 16:20:09 +02:00 committed by rubidium42
parent 392bcf5c9a
commit 18e8a34081
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/station_cmd.cpp
View File

@ -1419,10 +1419,6 @@ CommandCost CmdBuildRailStation(DoCommandFlag flags, TileIndex tile_org, RailTyp
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
TileIndexDiff tile_delta;
uint8_t numtracks_orig;
Track track;
st->train_station = new_location; st->train_station = new_location;
st->AddFacility(FACIL_TRAIN, new_location.tile); st->AddFacility(FACIL_TRAIN, new_location.tile);
@ -1434,13 +1430,14 @@ CommandCost CmdBuildRailStation(DoCommandFlag flags, TileIndex tile_org, RailTyp
st->cached_anim_triggers |= statspec->animation.triggers; st->cached_anim_triggers |= statspec->animation.triggers;
} }
tile_delta = (axis == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1)); TileIndexDiff tile_delta = (axis == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1)); // offset to go to the next platform tile
track = AxisToTrack(axis); TileIndexDiff track_delta = (axis == AXIS_X ? TileDiffXY(0, 1) : TileDiffXY(1, 0)); // offset to go to the next track
Track track = AxisToTrack(axis);
std::vector<uint8_t> layouts(numtracks * plat_len); std::vector<uint8_t> layouts(numtracks * plat_len);
GetStationLayout(layouts.data(), numtracks, plat_len, statspec); GetStationLayout(layouts.data(), numtracks, plat_len, statspec);
numtracks_orig = numtracks; uint8_t numtracks_orig = numtracks;
Company *c = Company::Get(st->owner); Company *c = Company::Get(st->owner);
size_t layout_idx = 0; size_t layout_idx = 0;
@ -1503,7 +1500,7 @@ CommandCost CmdBuildRailStation(DoCommandFlag flags, TileIndex tile_org, RailTyp
} while (--w); } while (--w);
AddTrackToSignalBuffer(tile_track, track, _current_company); AddTrackToSignalBuffer(tile_track, track, _current_company);
YapfNotifyTrackLayoutChange(tile_track, track); YapfNotifyTrackLayoutChange(tile_track, track);
tile_track += tile_delta ^ TileDiffXY(1, 1); // perpendicular to tile_delta tile_track += track_delta;
} while (--numtracks); } while (--numtracks);
for (uint i = 0; i < affected_vehicles.size(); ++i) { for (uint i = 0; i < affected_vehicles.size(); ++i) {