1
0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-19 12:39:11 +00:00

(svn r15541) -Revert (r15399): 'v->cargo_type' is also used in other places, which cannot accept CT_INVALID.

-Codechange: Add Engine::GetDefaultCargoType() and Engine::CanCarryCargo() and use them.
-Fix [FS#2617]: When articulated parts have no available default cargo, use the cargo type of the first part for livery selection.
-Change: To decide whether a vehicle is refittable do not test its current capacity for being zero, but always use the 'capacity property'.
  Note: The property is used unmodifed without calling CB 15/36. By setting it to a non-zero value and returning zero in the callback vehicles can be refitted to/from zero capacity for e.g. livery effects.
  Note: It is intentional that you cannot control refittability by CB 36.
This commit is contained in:
frosch
2009-02-21 12:52:41 +00:00
parent b674d1f6f5
commit d3850e101c
15 changed files with 171 additions and 163 deletions

View File

@@ -1085,7 +1085,7 @@
Engine 0
IsValidEngine(): true
GetName(): Kirby Paul Tank (Steam)
GetCargoType(): 0
GetCargoType(): 255
CanRefitCargo(): false
GetCapacity(): -1
GetReliability(): 75
@@ -1229,7 +1229,7 @@
Engine 8
IsValidEngine(): true
GetName(): Chaney 'Jubilee' (Steam)
GetCargoType(): 0
GetCargoType(): 255
CanRefitCargo(): false
GetCapacity(): -1
GetReliability(): 79
@@ -1247,7 +1247,7 @@
Engine 9
IsValidEngine(): true
GetName(): Ginzu 'A4' (Steam)
GetCargoType(): 0
GetCargoType(): 255
CanRefitCargo(): false
GetCapacity(): -1
GetReliability(): 83