petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r9688) -Codechange: Created a function to get default cargo type for a cargo type

Browse Source
This commit is contained in:
bjarni
2007-04-20 16:56:55 +00:00
parent afea22e013
commit 73875647b5
3 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/autoreplace_cmd.cpp
View File

@@ -87,34 +87,9 @@ static bool VerifyAutoreplaceRefitForOrders(const Vehicle *v, const EngineID eng
*/
static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type)
{
bool new_cargo_capacity = true;
CargoID new_cargo_type = CT_INVALID;
CargoID new_cargo_type = GetEngineCargoType(engine_type);
switch (v->type) {
case VEH_TRAIN:
new_cargo_capacity = (RailVehInfo(engine_type)->capacity > 0);
new_cargo_type = RailVehInfo(engine_type)->cargo_type;
break;
case VEH_ROAD:
new_cargo_capacity = (RoadVehInfo(engine_type)->capacity > 0);
new_cargo_type = RoadVehInfo(engine_type)->cargo_type;
break;
case VEH_SHIP:
new_cargo_capacity = (ShipVehInfo(engine_type)->capacity > 0);
new_cargo_type = ShipVehInfo(engine_type)->cargo_type;
break;
case VEH_AIRCRAFT:
/* all aircraft starts as passenger planes with cargo capacity
* new_cargo_capacity is always true for aircraft, which is the init value. No need to set it here */
new_cargo_type = CT_PASSENGERS;
break;
default: NOT_REACHED(); break;
}
if (!new_cargo_capacity) return CT_NO_REFIT; // Don't try to refit an engine with no cargo capacity
if (new_cargo_type == CT_INVALID) return CT_NO_REFIT; // Don't try to refit an engine with no cargo capacity
if (v->cargo_type == new_cargo_type || CanRefitTo(engine_type, v->cargo_type)) {
if (VerifyAutoreplaceRefitForOrders(v, engine_type)) {