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

(svn r18466) -Codechange: use CmdMoveRailWagon to attach a just build wagon to a chain

release/1.0
rubidium 2009-12-11 22:23:48 +00:00
parent b094312631
commit 9ae2422956
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/train_cmd.cpp
View File

@ -705,19 +705,6 @@ static CommandCost CmdBuildRailWagon(EngineID engine, TileIndex tile, DoCommandF
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
Vehicle *u = NULL;
Train *w;
FOR_ALL_TRAINS(w) {
/* do not connect new wagon with crashed/flooded consists */
if (w->tile == tile && w->IsFreeWagon() &&
w->engine_type == engine &&
!(w->vehstatus & VS_CRASHED)) {
u = w->Last();
break;
}
}
Train *v = new Train(); Train *v = new Train();
v->spritenum = rvi->image_index; v->spritenum = rvi->image_index;
@ -742,12 +729,8 @@ static CommandCost CmdBuildRailWagon(EngineID engine, TileIndex tile, DoCommandF
// v->subtype = 0; // v->subtype = 0;
v->SetWagon(); v->SetWagon();
if (u != NULL) { v->SetFreeWagon();
u->SetNext(v); InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
} else {
v->SetFreeWagon();
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
}
v->cargo_type = e->GetDefaultCargoType(); v->cargo_type = e->GetDefaultCargoType();
// v->cargo_subtype = 0; // v->cargo_subtype = 0;
@ -778,6 +761,18 @@ static CommandCost CmdBuildRailWagon(EngineID engine, TileIndex tile, DoCommandF
Company::Get(_current_company)->num_engines[engine]++; Company::Get(_current_company)->num_engines[engine]++;
CheckConsistencyOfArticulatedVehicle(v); CheckConsistencyOfArticulatedVehicle(v);
/* Try to connect the vehicle to one of free chains of wagons. */
Train *w;
FOR_ALL_TRAINS(w) {
/* do not connect new wagon with crashed/flooded consists */
if (w->tile == tile && w->IsFreeWagon() &&
w->engine_type == engine &&
!(w->vehstatus & VS_CRASHED)) {
DoCommand(0, v->index | (w->Last()->index << 16), 1, DC_EXEC, CMD_MOVE_RAIL_VEHICLE);
break;
}
}
} }
return value; return value;