dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'template_train_replacement-sx' into jgrpp

Browse Source 
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/saveload/afterload.cpp
This commit is contained in:
Jonathan G Rennison
2016-02-16 21:08:21 +00:00
parent b87957c9db f3e01f4c6d
commit 0779c7b7a9
25 changed files with 281 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/train_cmd.cpp
View File

@@ -4644,19 +4644,19 @@ Train* CmdBuildVirtualRailWagon(const Engine *e)
return v;
}
/**
* Build a railroad vehicle.
* @param tile tile of the depot where rail-vehicle is built.
* @param flags type of operation.
* @param e the engine to build.
* @param data bit 0 prevents any free cars from being added to the train.
* @param ret[out] the vehicle that has been built.
* @return the cost of this operation or an error.
*/
Train* CmdBuildVirtualRailVehicle(EngineID eid)
Train* CmdBuildVirtualRailVehicle(EngineID eid, bool lax_engine_check, StringID &error)
{
if (!IsEngineBuildable(eid, VEH_TRAIN, _current_company)) {
return NULL;
if (lax_engine_check) {
const Engine *e = Engine::GetIfValid(eid);
if (e == NULL || e->type != VEH_TRAIN) {
error = STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + VEH_TRAIN;
return NULL;
}
} else {
if (!IsEngineBuildable(eid, VEH_TRAIN, _current_company)) {
error = STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + VEH_TRAIN;
return NULL;
}
}
const Engine* e = Engine::Get(eid);
@@ -4664,6 +4664,7 @@ Train* CmdBuildVirtualRailVehicle(EngineID eid)
int num_vehicles = (e->u.rail.railveh_type == RAILVEH_MULTIHEAD ? 2 : 1) + CountArticulatedParts(eid, false);
if (!Train::CanAllocateItem(num_vehicles)) {
error = STR_ERROR_TOO_MANY_VEHICLES_IN_GAME;
return NULL;
}
@@ -4737,13 +4738,18 @@ CommandCost CmdBuildVirtualRailVehicle(TileIndex tile, DoCommandFlag flags, uint
{
EngineID eid = p1;
if (!IsEngineBuildable(eid, VEH_TRAIN, _current_company)) {
return_cmd_error(STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + VEH_TRAIN);
}
bool should_execute = (flags & DC_EXEC) != 0;
if (should_execute) {
Train* train = CmdBuildVirtualRailVehicle(eid);
StringID err = INVALID_STRING_ID;
Train* train = CmdBuildVirtualRailVehicle(eid, false, err);
if (train == NULL) {
return CMD_ERROR;
return_cmd_error(err);
}
}
@@ -4817,7 +4823,12 @@ CommandCost CmdTemplateReplaceVehicle(TileIndex tile, DoCommandFlag flags, uint3
CommandCost buyCost = TestBuyAllTemplateVehiclesInChain(tv, tile);
if (!buyCost.Succeeded() || !CheckCompanyHasMoney(buyCost)) {
if (!stayInDepot) incoming->vehstatus &= ~VS_STOPPED;
return_cmd_error(STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY);
if (!buyCost.Succeeded() && buyCost.GetErrorMessage() != INVALID_STRING_ID) {
return buyCost;
} else {
return_cmd_error(STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY);
}
}
}