diff options
Diffstat (limited to 'src/rail_cmd.cpp')
| -rw-r--r-- | src/rail_cmd.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index b8d8e6e54..b86616ba5 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -303,15 +303,13 @@ static inline bool ValParamTrackOrientation(Track track) {return IsValidTrack(tr CommandCost CmdBuildSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { Slope tileh; - RailType railtype; - Track track; + RailType railtype = (RailType)p1; + Track track = (Track)p2; TrackBits trackbit; CommandCost cost(EXPENSES_CONSTRUCTION); CommandCost ret; - if (!ValParamRailtype(p1) || !ValParamTrackOrientation((Track)p2)) return CMD_ERROR; - railtype = (RailType)p1; - track = (Track)p2; + if (!ValParamRailtype(railtype) || !ValParamTrackOrientation(track)) return CMD_ERROR; tileh = GetTileSlope(tile, NULL); trackbit = TrackToTrackBits(track); @@ -703,7 +701,7 @@ CommandCost CmdBuildTrainDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p Slope tileh; /* check railtype and valid direction for depot (0 through 3), 4 in total */ - if (!ValParamRailtype(p1)) return CMD_ERROR; + if (!ValParamRailtype((RailType)p1)) return CMD_ERROR; tileh = GetTileSlope(tile, NULL); @@ -1150,12 +1148,11 @@ void *UpdateTrainPowerProc(Vehicle *v, void *data) CommandCost CmdConvertRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { CommandCost cost(EXPENSES_CONSTRUCTION); + RailType totype = (RailType)p2; - if (!ValParamRailtype(p2)) return CMD_ERROR; + if (!ValParamRailtype(totype)) return CMD_ERROR; if (p1 >= MapSize()) return CMD_ERROR; - RailType totype = (RailType)p2; - uint ex = TileX(tile); uint ey = TileY(tile); uint sx = TileX(p1); |