|
@@ -434,7 +434,7 @@ static inline bool ValParamTrackOrientat
|
|
|
* @param text unused
|
|
|
* @return the cost of this operation or an error
|
|
|
*/
|
|
|
CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
RailType railtype = Extract<RailType, 0, 6>(p1);
|
|
|
Track track = Extract<Track, 0, 3>(p2);
|
|
@@ -622,7 +622,7 @@ CommandCost CmdBuildSingleRail(TileIndex
|
|
|
* @param text unused
|
|
|
* @return the cost of this operation or an error
|
|
|
*/
|
|
|
CommandCost CmdRemoveSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdRemoveSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
Track track = Extract<Track, 0, 3>(p2);
|
|
|
CommandCost cost(EXPENSES_CONSTRUCTION);
|
|
@@ -884,7 +884,7 @@ static CommandCost ValidateAutoDrag(Trac
|
|
|
* @param text unused
|
|
|
* @return the cost of this operation or an error
|
|
|
*/
|
|
|
static CommandCost CmdRailTrackHelper(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
static CommandCost CmdRailTrackHelper(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
CommandCost total_cost(EXPENSES_CONSTRUCTION);
|
|
|
Track track = Extract<Track, 6, 3>(p2);
|
|
@@ -945,7 +945,7 @@ static CommandCost CmdRailTrackHelper(Ti
|
|
|
* @return the cost of this operation or an error
|
|
|
* @see CmdRailTrackHelper
|
|
|
*/
|
|
|
CommandCost CmdBuildRailroadTrack(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdBuildRailroadTrack(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
return CmdRailTrackHelper(tile, flags, p1, ClrBit(p2, 9), text);
|
|
|
}
|
|
@@ -964,7 +964,7 @@ CommandCost CmdBuildRailroadTrack(TileIn
|
|
|
* @return the cost of this operation or an error
|
|
|
* @see CmdRailTrackHelper
|
|
|
*/
|
|
|
CommandCost CmdRemoveRailroadTrack(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdRemoveRailroadTrack(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
return CmdRailTrackHelper(tile, flags, p1, SetBit(p2, 9), text);
|
|
|
}
|
|
@@ -981,7 +981,7 @@ CommandCost CmdRemoveRailroadTrack(TileI
|
|
|
* @todo When checking for the tile slope,
|
|
|
* distinguish between "Flat land required" and "land sloped in wrong direction"
|
|
|
*/
|
|
|
CommandCost CmdBuildTrainDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdBuildTrainDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
/* check railtype and valid direction for depot (0 through 3), 4 in total */
|
|
|
RailType railtype = Extract<RailType, 0, 6>(p1);
|
|
@@ -1055,7 +1055,7 @@ CommandCost CmdBuildTrainDepot(TileIndex
|
|
|
* @return the cost of this operation or an error
|
|
|
* @todo p2 should be replaced by two bits for "along" and "against" the track.
|
|
|
*/
|
|
|
CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
Track track = Extract<Track, 0, 3>(p1);
|
|
|
bool ctrl_pressed = HasBit(p1, 3); // was the CTRL button pressed
|
|
@@ -1281,7 +1281,7 @@ static bool CheckSignalAutoFill(TileInde
|
|
|
* @param text unused
|
|
|
* @return the cost of this operation or an error
|
|
|
*/
|
|
|
static CommandCost CmdSignalTrackHelper(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
static CommandCost CmdSignalTrackHelper(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
CommandCost total_cost(EXPENSES_CONSTRUCTION);
|
|
|
TileIndex start_tile = tile;
|
|
@@ -1451,7 +1451,7 @@ static CommandCost CmdSignalTrackHelper(
|
|
|
* @return the cost of this operation or an error
|
|
|
* @see CmdSignalTrackHelper
|
|
|
*/
|
|
|
CommandCost CmdBuildSignalTrack(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdBuildSignalTrack(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
return CmdSignalTrackHelper(tile, flags, p1, p2, text);
|
|
|
}
|
|
@@ -1468,7 +1468,7 @@ CommandCost CmdBuildSignalTrack(TileInde
|
|
|
* @param text unused
|
|
|
* @return the cost of this operation or an error
|
|
|
*/
|
|
|
CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
Track track = Extract<Track, 0, 3>(p1);
|
|
|
|
|
@@ -1543,7 +1543,7 @@ CommandCost CmdRemoveSingleSignal(TileIn
|
|
|
* @return the cost of this operation or an error
|
|
|
* @see CmdSignalTrackHelper
|
|
|
*/
|
|
|
CommandCost CmdRemoveSignalTrack(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdRemoveSignalTrack(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
return CmdSignalTrackHelper(tile, flags, p1, SetBit(p2, 5), text); // bit 5 is remove bit
|
|
|
}
|
|
@@ -1571,7 +1571,7 @@ static Vehicle *UpdateTrainPowerProc(Veh
|
|
|
* @param text unused
|
|
|
* @return the cost of this operation or an error
|
|
|
*/
|
|
|
CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
RailType totype = Extract<RailType, 0, 6>(p2);
|
|
|
TileIndex area_start = p1;
|