(svn r16678) -Codechange: Turn CargoArray into a class, so one does not have to deal with sizeof() wrt. typedef-ed arrays.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/ai/api/ai_tile.cpp b/src/ai/api/ai_tile.cpp
index c7f67f603..ea13fe456 100644
--- a/src/ai/api/ai_tile.cpp
+++ b/src/ai/api/ai_tile.cpp
@@ -179,8 +179,7 @@
 {
 	if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius <= 0) return -1;
 
-	CargoArray acceptance;
-	::GetAcceptanceAroundTiles(acceptance, tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED);
+	CargoArray acceptance = ::GetAcceptanceAroundTiles(tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED);
 	return acceptance[cargo_type];
 }
 
@@ -188,8 +187,7 @@
 {
 	if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius <= 0) return -1;
 
-	CargoArray produced;
-	::GetProductionAroundTiles(produced, tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED);
+	CargoArray produced = ::GetProductionAroundTiles(tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED);
 	return produced[cargo_type];
 }