summaryrefslogtreecommitdiff
path: root/src/industry_cmd.cpp
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-06-27 17:05:20 +0000
committersmatz <smatz@openttd.org>2009-06-27 17:05:20 +0000
commit50b5678e267d371c9c69195966b60ce903bfbe46 (patch)
tree5f5b144a504cc9537b7073a88d66a38159b32393 /src/industry_cmd.cpp
parent996e5eea471f740428f2878884363521200d6ca1 (diff)
downloadopenttd-50b5678e267d371c9c69195966b60ce903bfbe46.tar.xz
(svn r16673) -Codechange: rename GetProducedCargo() to AddProducedCargo() and change its behaviour accordingly
Diffstat (limited to 'src/industry_cmd.cpp')
-rw-r--r--src/industry_cmd.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index 629123686..384ef4bd0 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -868,12 +868,14 @@ static TrackStatus GetTileTrackStatus_Industry(TileIndex tile, TransportType mod
return 0;
}
-static void GetProducedCargo_Industry(TileIndex tile, CargoID *b)
+static void AddProducedCargo_Industry(TileIndex tile, AcceptedCargo ac)
{
const Industry *i = GetIndustryByTile(tile);
- b[0] = i->produced_cargo[0];
- b[1] = i->produced_cargo[1];
+ for (uint j = 0; j < lengthof(i->produced_cargo); j++) {
+ CargoID cargo = i->produced_cargo[j];
+ if (cargo != CT_INVALID) ac[cargo]++;
+ }
}
static void ChangeTileOwner_Industry(TileIndex tile, Owner old_owner, Owner new_owner)
@@ -2417,7 +2419,7 @@ extern const TileTypeProcs _tile_type_industry_procs = {
AnimateTile_Industry, // animate_tile_proc
TileLoop_Industry, // tile_loop_proc
ChangeTileOwner_Industry, // change_tile_owner_proc
- GetProducedCargo_Industry, // get_produced_cargo_proc
+ AddProducedCargo_Industry, // add_produced_cargo_proc
NULL, // vehicle_enter_tile_proc
GetFoundation_Industry, // get_foundation_proc
TerraformTile_Industry, // terraform_tile_proc