(svn r16676) -Codechange: Rename AcceptedCargo to CargoArray and its instances to more meaningful names.

This commit is contained in:
frosch
2009-06-27 18:26:50 +00:00
parent e42deae3a9
commit 812ad41f23
14 changed files with 74 additions and 74 deletions

View File

@@ -70,11 +70,11 @@ typedef uint GetSlopeZProc(TileIndex tile, uint x, uint y);
typedef CommandCost ClearTileProc(TileIndex tile, DoCommandFlag flags);
/**
* Tile callback function signature for obtaining accepted cargo of a tile
* @param tile Tile queried for its accepted cargo
* @param res Storage destination of the cargo accepted
* Tile callback function signature for obtaining cargo acceptance of a tile
* @param tile Tile queried for its accepted cargo
* @param acceptance Storage destination of the cargo acceptance in 1/8
*/
typedef void AddAcceptedCargoProc(TileIndex tile, AcceptedCargo res);
typedef void AddAcceptedCargoProc(TileIndex tile, CargoArray acceptance);
/**
* Tile callback function signature for obtaining a tile description
@@ -100,10 +100,10 @@ typedef TrackStatus GetTileTrackStatusProc(TileIndex tile, TransportType mode, u
/**
* Tile callback function signature for obtaining the produced cargo of a tile.
* @param tile Tile being queried
* @param b Destination array of produced cargo
* @param tile Tile being queried
* @param produced Destination array for produced cargo
*/
typedef void AddProducedCargoProc(TileIndex tile, AcceptedCargo ac);
typedef void AddProducedCargoProc(TileIndex tile, CargoArray produced);
typedef bool ClickTileProc(TileIndex tile);
typedef void AnimateTileProc(TileIndex tile);
typedef void TileLoopProc(TileIndex tile);
@@ -157,18 +157,18 @@ VehicleEnterTileStatus VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y
void ChangeTileOwner(TileIndex tile, Owner old_owner, Owner new_owner);
void GetTileDesc(TileIndex tile, TileDesc *td);
static inline void AddAcceptedCargo(TileIndex tile, AcceptedCargo ac)
static inline void AddAcceptedCargo(TileIndex tile, CargoArray acceptance)
{
AddAcceptedCargoProc *proc = _tile_type_procs[GetTileType(tile)]->add_accepted_cargo_proc;
if (proc == NULL) return;
proc(tile, ac);
proc(tile, acceptance);
}
static inline void AddProducedCargo(TileIndex tile, AcceptedCargo ac)
static inline void AddProducedCargo(TileIndex tile, CargoArray produced)
{
AddProducedCargoProc *proc = _tile_type_procs[GetTileType(tile)]->add_produced_cargo_proc;
if (proc == NULL) return;
proc(tile, ac);
proc(tile, produced);
}
static inline void AnimateTile(TileIndex tile)