cpp/openttd-patchpack/source Changeset - r12160:b49804528c72

Changeset - r12160:b49804528c72

Parent rev.

Child rev.

[Not reviewed]

master

0 8 0

rubidium - 15 years ago 2009-06-16 13:52:18
rubidium@openttd.org

(svn r16581) -Codechange: unify the access to Engine::lifelength.

8 files changed with 17 insertions and 6 deletions:

src/ai/api/ai_engine.cpp

src/aircraft_cmd.cpp

src/build_vehicle_gui.cpp

src/engine.cpp

src/engine_base.h

src/roadveh_cmd.cpp

src/ship_cmd.cpp

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/ai/api/ai_engine.cpp

➞

Show inline comments

@@ @@ -108,25 +108,25 @@ @@
 /* static */ Money AIEngine::GetPrice(EngineID engine_id)
+{
 	if (!IsValidEngine(engine_id)) return -1;
 	return ::Engine::Get(engine_id)->GetCost();
+}
 /* static */ int32 AIEngine::GetMaxAge(EngineID engine_id)
+{
 	if (!IsValidEngine(engine_id)) return -1;
 	if (GetVehicleType(engine_id) == AIVehicle::VT_RAIL && IsWagon(engine_id)) return -1;
-	return ::Engine::Get(engine_id)->lifelength * DAYS_IN_LEAP_YEAR;
+	return ::Engine::Get(engine_id)->GetLifeLengthInDays();
+}
 /* static */ Money AIEngine::GetRunningCost(EngineID engine_id)
+{
 	if (!IsValidEngine(engine_id)) return -1;
 	return ::Engine::Get(engine_id)->GetRunningCost();
+}
 /* static */ int32 AIEngine::GetPower(EngineID engine_id)
+{
 	if (!IsValidEngine(engine_id)) return -1;

src/aircraft_cmd.cpp

➞

Show inline comments

@@ @@ -325,25 +325,25 @@ CommandCost CmdBuildAircraft(TileIndex t @@
 		v->engine_type = p1;
 		u->engine_type = p1;
 		v->subtype = (avi->subtype & AIR_CTOL ? AIR_AIRCRAFT : AIR_HELICOPTER);
 		v->UpdateDeltaXY(INVALID_DIR);
 		v->value = value.GetCost();
 		u->subtype = AIR_SHADOW;
 		u->UpdateDeltaXY(INVALID_DIR);
 		v->reliability = e->reliability;
 		v->reliability_spd_dec = e->reliability_spd_dec;
-		v->max_age = e->lifelength * DAYS_IN_LEAP_YEAR;
+		v->max_age = e->GetLifeLengthInDays();
 		_new_vehicle_id = v->index;
 		/* When we click on hangar we know the tile it is on. By that we know
 		 * its position in the array of depots the airport has.....we can search
 		 * layout for #th position of depot. Since layout must start with a listing
 		 * of all depots, it is simple */
 		for (uint i = 0;; i++) {
 			const Station *st = GetStationByTile(tile);
 			const AirportFTAClass *apc = st->Airport();
 			assert(i != apc->nof_depots);

src/build_vehicle_gui.cpp

➞

Show inline comments

@@ @@ -667,25 +667,25 @@ int DrawVehiclePurchaseInfo(int left, in @@
 		case VEH_SHIP:
 			y = DrawShipPurchaseInfo(left, right, y, engine_number, ShipVehInfo(engine_number), refittable);
 			break;
 		case VEH_AIRCRAFT:
 			y = DrawAircraftPurchaseInfo(left, right, y, engine_number, AircraftVehInfo(engine_number), refittable);
 			break;
+	}
 	/* Draw details, that applies to all types except rail wagons */
 	if (e->type != VEH_TRAIN || RailVehInfo(engine_number)->railveh_type != RAILVEH_WAGON) {
 		/* Design date - Life length */
 		SetDParam(0, ymd.year);
-		SetDParam(1, e->lifelength);
+		SetDParam(1, e->GetLifeLengthInDays() / DAYS_IN_LEAP_YEAR);
 		DrawString(left, right, y, STR_PURCHASE_INFO_DESIGNED_LIFE);
 		y += FONT_HEIGHT_NORMAL;
 		/* Reliability */
 		SetDParam(0, e->reliability * 100 >> 16);
 		DrawString(left, right, y, STR_PURCHASE_INFO_RELIABILITY);
 		y += FONT_HEIGHT_NORMAL;
+	}
 	/* Additional text from NewGRF */
 	y = ShowAdditionalText(left, right, y, engine_number);
 	if (refittable) y = ShowRefitOptionsList(left, right, y, engine_number);

src/engine.cpp

➞

Show inline comments

@@ @@ -307,24 +307,34 @@ uint Engine::GetDisplayWeight() const @@
 uint Engine::GetDisplayMaxTractiveEffort() const
+{
 	/* Currently only trains have 'tractive effort' */
 	switch (this->type) {
 		case VEH_TRAIN:
 			return (10 * this->GetDisplayWeight() * GetEngineProperty(this->index, 0x1F, this->u.rail.tractive_effort)) / 256;
 		default: NOT_REACHED();
+	}
+}
 /**
  * Returns the vehicle's life length in days.
  * @return the life length
  */
 Date Engine::GetLifeLengthInDays() const
+{
 	/* Assume leap years; this gives the player a bit more than the given amount of years, but never less. */
 	return this->lifelength * DAYS_IN_LEAP_YEAR;
+}
 /**
  * Initializes the EngineOverrideManager with the default engines.
  */
 void EngineOverrideManager::ResetToDefaultMapping()
+{
 	this->Clear();
 	for (VehicleType type = VEH_TRAIN; type <= VEH_AIRCRAFT; type++) {
 		for (uint internal_id = 0; internal_id < _engine_counts[type]; internal_id++) {
 			EngineIDMapping *eid = this->Append();
 			eid->type            = type;
 			eid->grfid           = INVALID_GRFID;
 			eid->internal_id     = internal_id;
 			eid->substitute_id   = internal_id;

src/engine_base.h

➞

Show inline comments

@@ @@ -50,24 +50,25 @@ struct Engine : EnginePool::PoolItem<&_e @@
 	Engine(VehicleType type, EngineID base);
 	~Engine();
 	CargoID GetDefaultCargoType() const;
 	bool CanCarryCargo() const;
 	uint GetDisplayDefaultCapacity() const;
 	Money GetRunningCost() const;
 	Money GetCost() const;
 	uint GetDisplayMaxSpeed() const;
 	uint GetPower() const;
 	uint GetDisplayWeight() const;
 	uint GetDisplayMaxTractiveEffort() const;
 	Date GetLifeLengthInDays() const;
 };
 struct EngineIDMapping {
 	uint32 grfid;          ///< The GRF ID of the file the entity belongs to
 	uint16 internal_id;    ///< The internal ID within the GRF file
 	VehicleTypeByte type;  ///< The engine type
 	uint8  substitute_id;  ///< The (original) entity ID to use if this GRF is not available (currently not used)
 };
 /**
  * Stores the mapping of EngineID to the internal id of newgrfs.
  * Note: This is not part of Engine, as the data in the EngineOverrideManager and the engine pool get resetted in different cases.

src/roadveh_cmd.cpp

➞

Show inline comments

@@ @@ -221,25 +221,25 @@ CommandCost CmdBuildRoadVeh(TileIndex ti @@
 //		v->next_order_param = v->next_order = 0;
 //		v->load_unload_time_rem = 0;
 //		v->progress = 0;
 //		v->overtaking = 0;
 		v->last_station_visited = INVALID_STATION;
 		v->max_speed = rvi->max_speed;
 		v->engine_type = (EngineID)p1;
 		v->reliability = e->reliability;
 		v->reliability_spd_dec = e->reliability_spd_dec;
-		v->max_age = e->lifelength * DAYS_IN_LEAP_YEAR;
+		v->max_age = e->GetLifeLengthInDays();
 		_new_vehicle_id = v->index;
 		v->name = NULL;
 		v->service_interval = Company::Get(v->owner)->settings.vehicle.servint_roadveh;
 		v->date_of_last_service = _date;
 		v->build_year = _cur_year;
 		v->cur_image = SPR_IMG_QUERY;
 		v->random_bits = VehicleRandomBits();
 		SetRoadVehFront(v);

src/ship_cmd.cpp

➞

Show inline comments

@@ @@ -790,25 +790,25 @@ CommandCost CmdBuildShip(TileIndex tile, @@
 		v->spritenum = svi->image_index;
 		v->cargo_type = e->GetDefaultCargoType();
 		v->cargo_subtype = 0;
 		v->cargo_cap = svi->capacity;
 		v->value = value.GetCost();
 		v->last_station_visited = INVALID_STATION;
 		v->max_speed = svi->max_speed;
 		v->engine_type = p1;
 		v->reliability = e->reliability;
 		v->reliability_spd_dec = e->reliability_spd_dec;
-		v->max_age = e->lifelength * DAYS_IN_LEAP_YEAR;
+		v->max_age = e->GetLifeLengthInDays();
 		_new_vehicle_id = v->index;
 		v->name = NULL;
 		v->state = TRACK_BIT_DEPOT;
 		v->service_interval = Company::Get(_current_company)->settings.vehicle.servint_ships;
 		v->date_of_last_service = _date;
 		v->build_year = _cur_year;
 		v->cur_image = SPR_IMG_QUERY;
 		v->random_bits = VehicleRandomBits();
 		v->vehicle_flags = 0;

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -860,25 +860,25 @@ CommandCost CmdBuildRailVehicle(TileInde @@
 		v->cargo_type = e->GetDefaultCargoType();
 //		v->cargo_subtype = 0;
 		v->cargo_cap = rvi->capacity;
 		v->max_speed = rvi->max_speed;
 		v->value = value.GetCost();
 		v->last_station_visited = INVALID_STATION;
 //		v->dest_tile = 0;
 		v->engine_type = p1;
 		v->reliability = e->reliability;
 		v->reliability_spd_dec = e->reliability_spd_dec;
-		v->max_age = e->lifelength * DAYS_IN_LEAP_YEAR;
+		v->max_age = e->GetLifeLengthInDays();
 		v->name = NULL;
 		v->railtype = rvi->railtype;
 		_new_vehicle_id = v->index;
 		v->service_interval = Company::Get(_current_company)->settings.vehicle.servint_trains;
 		v->date_of_last_service = _date;
 		v->build_year = _cur_year;
 		v->cur_image = SPR_IMG_QUERY;
 		v->random_bits = VehicleRandomBits();
 //		v->vehicle_flags = 0;

0 comments (0 inline, 0 general)