diff options
author | bjarni <bjarni@openttd.org> | 2007-04-20 16:56:55 +0000 |
---|---|---|
committer | bjarni <bjarni@openttd.org> | 2007-04-20 16:56:55 +0000 |
commit | 809888fa21deb78aca76f2647eb2a94c7d858442 (patch) | |
tree | 5ebbc58e20bc27e0078c3a734402509a3debef53 | |
parent | 9c40b92323b8691622aa94886640cefb69788df4 (diff) | |
download | openttd-809888fa21deb78aca76f2647eb2a94c7d858442.tar.xz |
(svn r9688) -Codechange: Created a function to get default cargo type for a cargo type
-rw-r--r-- | src/autoreplace_cmd.cpp | 29 | ||||
-rw-r--r-- | src/engine.cpp | 29 | ||||
-rw-r--r-- | src/engine.h | 1 |
3 files changed, 32 insertions, 27 deletions
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp index 6a191cb49..36bf98e7f 100644 --- a/src/autoreplace_cmd.cpp +++ b/src/autoreplace_cmd.cpp @@ -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; - - 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; - } + CargoID new_cargo_type = GetEngineCargoType(engine_type); - 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)) { diff --git a/src/engine.cpp b/src/engine.cpp index 4a0b27161..41a7bbeaa 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -404,6 +404,35 @@ bool IsEngineBuildable(EngineID engine, byte type, PlayerID player) return true; } +/** Get the default cargo type for a certain engine type + * @param engine The ID to get the cargo for + * @return The cargo type. CT_INVALID means no cargo capacity + */ +CargoID GetEngineCargoType(EngineID engine) +{ + assert(IsEngineIndex(engine)); + + switch (GetEngine(engine)->type) { + case VEH_TRAIN: + if (RailVehInfo(engine)->capacity == 0) return CT_INVALID; + return RailVehInfo(engine)->cargo_type; + + case VEH_ROAD: + if (RoadVehInfo(engine)->capacity == 0) return CT_INVALID; + return RoadVehInfo(engine)->cargo_type; + + case VEH_SHIP: + if (ShipVehInfo(engine)->capacity == 0) return CT_INVALID; + return ShipVehInfo(engine)->cargo_type; + + case VEH_AIRCRAFT: + /* all aircraft starts as passenger planes with cargo capacity */ + return CT_PASSENGERS; + + default: NOT_REACHED(); return CT_INVALID; + } +} + /************************************************************************ * Engine Replacement stuff ************************************************************************/ diff --git a/src/engine.h b/src/engine.h index 4ebf1a9f2..54920e135 100644 --- a/src/engine.h +++ b/src/engine.h @@ -153,6 +153,7 @@ void LoadCustomEngineNames(); void DeleteCustomEngineNames(); bool IsEngineBuildable(EngineID engine, byte type, PlayerID player); +CargoID GetEngineCargoType(EngineID engine); enum { NUM_NORMAL_RAIL_ENGINES = 54, |