Mercurial > hg > openttd

changeset 13089:559dafab3ecb draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r17589) -Codechange: rename town_acc to always_accepted
author smatz <smatz@openttd.org>
date Sun, 20 Sep 2009 17:44:33 +0000
parents 1008c63fa996
children 78bc107232da
files src/economy.cpp src/industry_cmd.cpp src/saveload/station_sl.cpp src/station_base.h src/station_cmd.cpp src/station_func.h src/tile_cmd.h src/town_cmd.cpp src/unmovable_cmd.cpp
diffstat 9 files changed, 28 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -933,7 +933,7 @@
 	uint accepted = DeliverGoodsToIndustry(st, cargo_type, num_pieces, src_type == ST_INDUSTRY ? src : INVALID_INDUSTRY);
 
 	/* If there are non-industries around accepting the cargo, accept it all */
-	if (HasBit(st->town_acc, cargo_type)) accepted = num_pieces;
+	if (HasBit(st->always_accepted, cargo_type)) accepted = num_pieces;
 
 	/* Determine profit */
 	Money profit = GetTransportedGoodsIncome(accepted, DistanceManhattan(source_tile, st->xy), days_in_transit, cargo_type);
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -400,7 +400,7 @@
 	return FlatteningFoundation(tileh);
 }
 
-static void AddAcceptedCargo_Industry(TileIndex tile, CargoArray &acceptance, uint32 *town_acc)
+static void AddAcceptedCargo_Industry(TileIndex tile, CargoArray &acceptance, uint32 *always_accepted)
 {
 	IndustryGfx gfx = GetIndustryGfx(tile);
 	const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx);
--- a/src/saveload/station_sl.cpp
+++ b/src/saveload/station_sl.cpp
@@ -326,7 +326,7 @@
 	      SLE_VAR(Station, last_vehicle_type,          SLE_UINT8),
 	      SLE_VAR(Station, had_vehicle_of_type,        SLE_UINT8),
 	      SLE_LST(Station, loading_vehicles,           REF_VEHICLE),
-	  SLE_CONDVAR(Station, town_acc,                   SLE_UINT32, 127, SL_MAX_VERSION),
+	  SLE_CONDVAR(Station, always_accepted,            SLE_UINT32, 127, SL_MAX_VERSION),
 
 	      SLE_END()
 };
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -85,7 +85,7 @@
 	byte last_vehicle_type;
 	std::list<Vehicle *> loading_vehicles;
 	GoodsEntry goods[NUM_CARGO];  ///< Goods at this station
-	uint32 town_acc; ///< Bitmask of cargos accepted by town houses and headquarters
+	uint32 always_accepted;       ///< Bitmask of cargos accepted by town houses and headquarters
 
 	IndustryVector industries_near; ///< Cached list of industries near the station that can accept cargo, @see DeliverGoodsToIndustry()
 
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -508,12 +508,12 @@
  * @param w X extent of area
  * @param h Y extent of area
  * @param rad Search radius in addition to given area
- * @param town_acc bitmask of cargo accepted by houses and headquarters; can be NULL
+ * @param always_accepted bitmask of cargo accepted by houses and headquarters; can be NULL
  */
-CargoArray GetAcceptanceAroundTiles(TileIndex tile, int w, int h, int rad, uint32 *town_acc)
+CargoArray GetAcceptanceAroundTiles(TileIndex tile, int w, int h, int rad, uint32 *always_accepted)
 {
 	CargoArray acceptance;
-	if (town_acc != NULL) *town_acc = 0;
+	if (always_accepted != NULL) *always_accepted = 0;
 
 	int x = TileX(tile);
 	int y = TileY(tile);
@@ -533,7 +533,7 @@
 	for (int yc = y1; yc != y2; yc++) {
 		for (int xc = x1; xc != x2; xc++) {
 			TileIndex tile = TileXY(xc, yc);
-			AddAcceptedCargo(tile, acceptance, town_acc);
+			AddAcceptedCargo(tile, acceptance, always_accepted);
 		}
 	}
 
@@ -557,7 +557,7 @@
 			st->rect.right  - st->rect.left + 1,
 			st->rect.bottom - st->rect.top  + 1,
 			st->GetCatchmentRadius(),
-			&st->town_acc
+			&st->always_accepted
 		);
 	}
 
--- a/src/station_func.h
+++ b/src/station_func.h
@@ -30,7 +30,7 @@
 void UpdateAllStationVirtCoords();
 
 CargoArray GetProductionAroundTiles(TileIndex tile, int w, int h, int rad);
-CargoArray GetAcceptanceAroundTiles(TileIndex tile, int w, int h, int rad, uint32 *town_acc = NULL);
+CargoArray GetAcceptanceAroundTiles(TileIndex tile, int w, int h, int rad, uint32 *always_accepted = NULL);
 
 void UpdateStationAcceptance(Station *st, bool show_msg);
 
--- a/src/tile_cmd.h
+++ b/src/tile_cmd.h
@@ -78,11 +78,11 @@
 
 /**
  * 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
- * @param town_acc   Bitmask of town and headquarters-accepted cargo
+ * @param tile            Tile queried for its accepted cargo
+ * @param acceptance      Storage destination of the cargo acceptance in 1/8
+ * @param always_accepted Bitmask of town and headquarters-accepted cargo
  */
-typedef void AddAcceptedCargoProc(TileIndex tile, CargoArray &acceptance, uint32 *town_acc);
+typedef void AddAcceptedCargoProc(TileIndex tile, CargoArray &acceptance, uint32 *always_accepted);
 
 /**
  * Tile callback function signature for obtaining a tile description
@@ -165,12 +165,12 @@
 void ChangeTileOwner(TileIndex tile, Owner old_owner, Owner new_owner);
 void GetTileDesc(TileIndex tile, TileDesc *td);
 
-static inline void AddAcceptedCargo(TileIndex tile, CargoArray &acceptance, uint32 *town_acc)
+static inline void AddAcceptedCargo(TileIndex tile, CargoArray &acceptance, uint32 *always_accepted)
 {
 	AddAcceptedCargoProc *proc = _tile_type_procs[GetTileType(tile)]->add_accepted_cargo_proc;
 	if (proc == NULL) return;
-	uint32 dummy = 0; // use dummy bitmask so there don't need to be several 'town_acc != NULL' checks
-	proc(tile, acceptance, town_acc == NULL ? &dummy : town_acc);
+	uint32 dummy = 0; // use dummy bitmask so there don't need to be several 'always_accepted != NULL' checks
+	proc(tile, acceptance, always_accepted == NULL ? &dummy : always_accepted);
 }
 
 static inline void AddProducedCargo(TileIndex tile, CargoArray &produced)
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -592,14 +592,14 @@
 	}
 }
 
-static inline void AddAcceptedCargoSetMask(CargoID cargo, uint amount, CargoArray &acceptance, uint32 *town_acc)
+static inline void AddAcceptedCargoSetMask(CargoID cargo, uint amount, CargoArray &acceptance, uint32 *always_accepted)
 {
 	if (cargo == CT_INVALID || amount == 0) return;
 	acceptance[cargo] += amount;
-	SetBit(*town_acc, cargo);
+	SetBit(*always_accepted, cargo);
 }
 
-static void AddAcceptedCargo_Town(TileIndex tile, CargoArray &acceptance, uint32 *town_acc)
+static void AddAcceptedCargo_Town(TileIndex tile, CargoArray &acceptance, uint32 *always_accepted)
 {
 	const HouseSpec *hs = HouseSpec::Get(GetHouseType(tile));
 	CargoID accepts[3];
@@ -624,13 +624,13 @@
 	if (HasBit(hs->callback_mask, CBM_HOUSE_CARGO_ACCEPTANCE)) {
 		uint16 callback = GetHouseCallback(CBID_HOUSE_CARGO_ACCEPTANCE, 0, 0, GetHouseType(tile), Town::GetByTile(tile), tile);
 		if (callback != CALLBACK_FAILED) {
-			AddAcceptedCargoSetMask(accepts[0], GB(callback, 0, 4), acceptance, town_acc);
-			AddAcceptedCargoSetMask(accepts[1], GB(callback, 4, 4), acceptance, town_acc);
+			AddAcceptedCargoSetMask(accepts[0], GB(callback, 0, 4), acceptance, always_accepted);
+			AddAcceptedCargoSetMask(accepts[1], GB(callback, 4, 4), acceptance, always_accepted);
 			if (_settings_game.game_creation.landscape != LT_TEMPERATE && HasBit(callback, 12)) {
 				/* The 'S' bit indicates food instead of goods */
-				AddAcceptedCargoSetMask(CT_FOOD, GB(callback, 8, 4), acceptance, town_acc);
+				AddAcceptedCargoSetMask(CT_FOOD, GB(callback, 8, 4), acceptance, always_accepted);
 			} else {
-				AddAcceptedCargoSetMask(accepts[2], GB(callback, 8, 4), acceptance, town_acc);
+				AddAcceptedCargoSetMask(accepts[2], GB(callback, 8, 4), acceptance, always_accepted);
 			}
 			return;
 		}
@@ -638,7 +638,7 @@
 
 	/* No custom acceptance, so fill in with the default values */
 	for (uint8 i = 0; i < lengthof(accepts); i++) {
-		AddAcceptedCargoSetMask(accepts[i], hs->cargo_acceptance[i], acceptance, town_acc);
+		AddAcceptedCargoSetMask(accepts[i], hs->cargo_acceptance[i], acceptance, always_accepted);
 	}
 }
 
--- a/src/unmovable_cmd.cpp
+++ b/src/unmovable_cmd.cpp
@@ -305,7 +305,7 @@
 	return CommandCost();
 }
 
-static void AddAcceptedCargo_Unmovable(TileIndex tile, CargoArray &acceptance, uint32 *town_acc)
+static void AddAcceptedCargo_Unmovable(TileIndex tile, CargoArray &acceptance, uint32 *always_accepted)
 {
 	if (!IsCompanyHQ(tile)) return;
 
@@ -318,14 +318,14 @@
 	/* Top town building generates 10, so to make HQ interesting, the top
 	 * type makes 20. */
 	acceptance[CT_PASSENGERS] += max(1U, level);
-	SetBit(*town_acc, CT_PASSENGERS);
+	SetBit(*always_accepted, CT_PASSENGERS);
 
 	/* Top town building generates 4, HQ can make up to 8. The
 	 * proportion passengers:mail is different because such a huge
 	 * commercial building generates unusually high amount of mail
 	 * correspondence per physical visitor. */
 	acceptance[CT_MAIL] += max(1U, level / 2);
-	SetBit(*town_acc, CT_MAIL);
+	SetBit(*always_accepted, CT_MAIL);
 }