summaryrefslogtreecommitdiff
path: root/src/town_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/town_cmd.cpp
parent996e5eea471f740428f2878884363521200d6ca1 (diff)
downloadopenttd-50b5678e267d371c9c69195966b60ce903bfbe46.tar.xz
(svn r16673) -Codechange: rename GetProducedCargo() to AddProducedCargo() and change its behaviour accordingly
Diffstat (limited to 'src/town_cmd.cpp')
-rw-r--r--src/town_cmd.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index dabf20ca3..c51f5df38 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -555,7 +555,7 @@ static CommandCost ClearTile_Town(TileIndex tile, DoCommandFlag flags)
return cost;
}
-static void GetProducedCargo_Town(TileIndex tile, CargoID *b)
+static void AddProducedCargo_Town(TileIndex tile, AcceptedCargo ac)
{
HouseID house_id = GetHouseType(tile);
const HouseSpec *hs = HouseSpec::Get(house_id);
@@ -570,14 +570,14 @@ static void GetProducedCargo_Town(TileIndex tile, CargoID *b)
CargoID cargo = GetCargoTranslation(GB(callback, 8, 7), hs->grffile);
if (cargo == CT_INVALID) continue;
- *(b++) = cargo;
+ ac[cargo]++;
}
} else {
if (hs->population > 0) {
- *(b++) = CT_PASSENGERS;
+ ac[CT_PASSENGERS]++;
}
if (hs->mail_generation > 0) {
- *(b++) = CT_MAIL;
+ ac[CT_MAIL]++;
}
}
}
@@ -2903,7 +2903,7 @@ extern const TileTypeProcs _tile_type_town_procs = {
AnimateTile_Town, // animate_tile_proc
TileLoop_Town, // tile_loop_clear
ChangeTileOwner_Town, // change_tile_owner_clear
- GetProducedCargo_Town, // get_produced_cargo_proc
+ AddProducedCargo_Town, // add_produced_cargo_proc
NULL, // vehicle_enter_tile_proc
GetFoundation_Town, // get_foundation_proc
TerraformTile_Town, // terraform_tile_proc