cpp/openttd-patchpack/source Changeset - r8556:c5860d29500d

Changeset - r8556:c5860d29500d

Parent rev.

Child rev.

[Not reviewed]

master

0 14 0

smatz - 16 years ago 2008-02-13 19:24:40
smatz@openttd.org

(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
-Fix [FS#1739]: vehicle profit is now counted with 8bit fract, so it is now shown properly in the vehicle details window

14 files changed with 76 insertions and 50 deletions:

src/ai/default/default.cpp

src/ai/trolly/trolly.cpp

src/aircraft_cmd.cpp

src/economy.cpp

src/group_gui.cpp

src/newgrf_engine.cpp

src/openttd.cpp

src/roadveh_cmd.cpp

src/saveload.cpp

src/ship_cmd.cpp

src/train_cmd.cpp

src/vehicle.cpp

src/vehicle_base.h

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/ai/default/default.cpp

➞

Show inline comments

@@ @@ -109,14 +109,14 @@ static void AiStateVehLoop(Player *p) @@
 				_players_ai[p->index].cur_veh = v;
 				return;
+			}
 			/* not profitable? */
 			if (v->age >= 730 &&
 					v->profit_last_year < _price.station_value * 5 &&
 					v->profit_this_year < _price.station_value * 5) {
 					v->profit_last_year >> 8 < _price.station_value * 5 &&
 					v->profit_this_year >> 8 < _price.station_value * 5) {
 				_players_ai[p->index].state_counter = 0;
 				_players_ai[p->index].state = AIS_SELL_VEHICLE;
 				_players_ai[p->index].cur_veh = v;
 				return;
+			}

src/ai/trolly/trolly.cpp

➞

Show inline comments

@@ @@ -1249,13 +1249,13 @@ static void AiNew_CheckVehicle(Player *p @@
 	if (v->age < 180) return;
 	// When a vehicle is older then 1 year, it should make money...
 	if (v->age > 360) {
 		// If both years together are not more than AI_MINIMUM_ROUTE_PROFIT,
 		//  it is not worth the line I guess...
 		if (v->profit_last_year + v->profit_this_year < AI_MINIMUM_ROUTE_PROFIT ||
+		if ((v->profit_last_year + v->profit_this_year) >> 8 < AI_MINIMUM_ROUTE_PROFIT ||
 				(v->reliability * 100 >> 16) < 40) {
 			// There is a possibility that the route is fucked up...
 			if (v->cargo.DaysInTransit() > AI_VEHICLE_LOST_DAYS) {
 				// The vehicle is lost.. check the route, or else, get the vehicle
 				//  back to a depot
 				// TODO: make this piece of code

src/aircraft_cmd.cpp

➞

Show inline comments

@@ @@ -318,12 +318,14 @@ CommandCost CmdBuildAircraft(TileIndex t @@
 		v->x_pos = u->x_pos = x;
 		v->y_pos = u->y_pos = y;
 		u->z_pos = GetSlopeZ(x, y);
 		v->z_pos = u->z_pos + 1;
 		v->running_ticks = 0;
 //		u->delta_x = u->delta_y = 0;
 		v->vehstatus = VS_HIDDEN | VS_STOPPED | VS_DEFPAL;
 		u->vehstatus = VS_HIDDEN | VS_UNCLICKABLE | VS_SHADOW;
 		v->spritenum = avi->image_index;
@@ @@ -732,17 +734,18 @@ void Aircraft::OnNewDay() @@
 	CheckOrders(this);
 	CheckVehicleBreakdown(this);
 	AgeVehicle(this);
 	CheckIfAircraftNeedsService(this);
-	if (this->vehstatus & VS_STOPPED) return;
+	if (this->running_ticks == 0) return;
-	CommandCost cost = CommandCost(EXPENSES_AIRCRAFT_RUN, GetVehicleProperty(this, 0x0E, AircraftVehInfo(this->engine_type)->running_cost) * _price.aircraft_running / 364);
+	CommandCost cost(EXPENSES_AIRCRAFT_RUN, GetVehicleProperty(this, 0x0E, AircraftVehInfo(this->engine_type)->running_cost) * _price.aircraft_running * this->running_ticks / (364 * DAY_TICKS));
 	this->profit_this_year -= cost.GetCost() >> 8;
 	this->profit_this_year -= cost.GetCost();
 	this->running_ticks = 0;
 	SubtractMoneyFromPlayerFract(this->owner, cost);
 	InvalidateWindow(WC_VEHICLE_DETAILS, this->index);
 	InvalidateWindowClasses(WC_AIRCRAFT_LIST);
+}
@@ @@ -2143,12 +2146,14 @@ static void AircraftEventHandler(Vehicle @@
+}
 void Aircraft::Tick()
+{
 	if (!IsNormalAircraft(this)) return;
 	if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
 	if (this->subtype == AIR_HELICOPTER) HelicopterTickHandler(this);
 	AgeAircraftCargo(this);
 	for (uint i = 0; i != 2; i++) {
 		AircraftEventHandler(this, i);

src/economy.cpp

➞

Show inline comments

@@ @@ -160,17 +160,15 @@ int UpdateCompanyRatingAndValue(Player * @@
 		FOR_ALL_VEHICLES(v) {
 			if (v->owner != owner) continue;
 			if (IsPlayerBuildableVehicleType(v->type) && v->IsPrimaryVehicle()) {
 				num++;
 				if (v->age > 730) {
 					/* Find the vehicle with the lowest amount of profit */
 					if (min_profit_first == true) {
 						min_profit = v->profit_last_year;
 					if (min_profit_first || min_profit > v->profit_last_year >> 8) {
 						min_profit = v->profit_last_year >> 8;
 						min_profit_first = false;
 					} else if (min_profit > v->profit_last_year) {
 						min_profit = v->profit_last_year;
+					}
+				}
+			}
+		}
 		_score_part[owner][SCORE_VEHICLES] = num;
@@ @@ -1502,13 +1500,13 @@ void VehiclePayment(Vehicle *front_v) @@
 						cp->count,
 						/* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */
 						DistanceManhattan(cp->loaded_at_xy, GetStation(last_visited)->xy),
 						cp->days_in_transit,
 						v->cargo_type);
 					front_v->profit_this_year += profit;
+					front_v->profit_this_year += profit << 8;
 					virtual_profit   += profit; // accumulate transfer profits for whole vehicle
 					cp->feeder_share += profit; // account for the (virtual) profit already made for the cargo packet
 					cp->paid_for      = true;   // record that the cargo has been paid for to eliminate double counting
+				}
 				result |= 2;
@@ @@ -1520,13 +1518,13 @@ void VehiclePayment(Vehicle *front_v) @@
 	if (virtual_profit > 0) {
 		ShowFeederIncomeAnimation(front_v->x_pos, front_v->y_pos, front_v->z_pos, virtual_profit);
+	}
 	if (route_profit != 0) {
 		front_v->profit_this_year += vehicle_profit;
+		front_v->profit_this_year += vehicle_profit << 8;
 		SubtractMoneyFromPlayer(CommandCost(front_v->GetExpenseType(true), -route_profit));
 		if (IsLocalPlayer() && !PlayVehicleSound(front_v, VSE_LOAD_UNLOAD)) {
 			SndPlayVehicleFx(SND_14_CASHTILL, front_v);
+		}

src/group_gui.cpp

➞

Show inline comments

@@ @@ -480,14 +480,14 @@ static void GroupWndProc(Window *w, Wind @@
 				SetDParam(0, v->unitnumber);
 				DrawString(x, y2 + 2, v->IsInDepot() ? STR_021F : (v->age > v->max_age - 366 ? STR_00E3 : STR_00E2), TC_FROMSTRING);
 				if (w->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG2) DrawSmallOrderList(v, x + 138, y2);
 				SetDParam(0, v->profit_this_year);
 				SetDParam(1, v->profit_last_year);
 				SetDParam(0, v->profit_this_year >> 8);
 				SetDParam(1, v->profit_last_year >> 8);
 				DrawString(x + 19, y2 + w->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING);
 				if (IsValidGroupID(v->group_id)) {
 					SetDParam(0, v->group_id);
 					DrawString(x + 19, y2, STR_GROUP_TINY_NAME, TC_BLACK);
+				}

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -691,20 +691,20 @@ static uint32 VehicleGetVariable(const R @@
 		case 0x4C: return v->breakdown_delay;
 		case 0x4D: return v->breakdown_chance;
 		case 0x4E: return v->reliability;
 		case 0x4F: return GB(v->reliability, 8, 8);
 		case 0x50: return v->reliability_spd_dec;
 		case 0x51: return GB(v->reliability_spd_dec, 8, 8);
 		case 0x52: return ClampToI32(v->profit_this_year);
 		case 0x53: return GB(ClampToI32(v->profit_this_year),  8, 24);
 		case 0x54: return GB(ClampToI32(v->profit_this_year), 16, 16);
 		case 0x55: return GB(ClampToI32(v->profit_this_year), 24,  8);
 		case 0x56: return ClampToI32(v->profit_last_year);
 		case 0x57: return GB(ClampToI32(v->profit_last_year),  8, 24);
 		case 0x58: return GB(ClampToI32(v->profit_last_year), 16, 16);
 		case 0x59: return GB(ClampToI32(v->profit_last_year), 24,  8);
 		case 0x52: return ClampToI32(v->profit_this_year >> 8);
 		case 0x53: return GB(ClampToI32(v->profit_this_year >> 8),  8, 24);
 		case 0x54: return GB(ClampToI32(v->profit_this_year >> 8), 16, 16);
 		case 0x55: return GB(ClampToI32(v->profit_this_year >> 8), 24,  8);
 		case 0x56: return ClampToI32(v->profit_last_year >> 8);
 		case 0x57: return GB(ClampToI32(v->profit_last_year >> 8),  8, 24);
 		case 0x58: return GB(ClampToI32(v->profit_last_year >> 8), 16, 16);
 		case 0x59: return GB(ClampToI32(v->profit_last_year >> 8), 24,  8);
 		case 0x5A: return v->Next() == NULL ? INVALID_VEHICLE : v->Next()->index;
 		case 0x5C: return ClampToI32(v->value);
 		case 0x5D: return GB(ClampToI32(v->value),  8, 24);
 		case 0x5E: return GB(ClampToI32(v->value), 16, 16);
 		case 0x5F: return GB(ClampToI32(v->value), 24,  8);
 		case 0x72: return v->cargo_subtype;

src/openttd.cpp

➞

Show inline comments

@@ @@ -2416,12 +2416,22 @@ bool AfterLoadGame() @@
 			_patches.pathfinder_for_ships = VPF_YAPF;
 		} else {
 			_patches.pathfinder_for_ships = (_patches.new_pathfinding_all ? VPF_NPF : VPF_OPF);
+		}
+	}
 	if (CheckSavegameVersion(88)) {
 		/* Profits are now with 8 bit fract */
 		Vehicle *v;
 		FOR_ALL_VEHICLES(v) {
 			v->profit_this_year <<= 8;
 			v->profit_last_year <<= 8;
 			v->running_ticks = 0;
+		}
+	}
 	return InitializeWindowsAndCaches();
+}
 /** Reload all NewGRF files during a running game. This is a cut-down
  * version of AfterLoadGame().
  * XXX - We need to reset the vehicle position hash because with a non-empty

src/roadveh_cmd.cpp

➞

Show inline comments

@@ @@ -216,12 +216,14 @@ CommandCost CmdBuildRoadVeh(TileIndex ti @@
 		x = TileX(tile) * TILE_SIZE + TILE_SIZE / 2;
 		y = TileY(tile) * TILE_SIZE + TILE_SIZE / 2;
 		v->x_pos = x;
 		v->y_pos = y;
 		v->z_pos = GetSlopeZ(x, y);
 		v->running_ticks = 0;
 		v->u.road.state = RVSB_IN_DEPOT;
 		v->vehstatus = VS_HIDDEN | VS_STOPPED | VS_DEFPAL;
 		v->spritenum = rvi->image_index;
 		v->cargo_type = rvi->cargo_type;
 		v->cargo_subtype = 0;
@@ @@ -1963,13 +1965,16 @@ static void AgeRoadVehCargo(Vehicle *v) @@
+}
 void RoadVehicle::Tick()
+{
 	AgeRoadVehCargo(this);
 	if (IsRoadVehFront(this)) RoadVehController(this);
 	if (IsRoadVehFront(this)) {
 		if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
 		RoadVehController(this);
+	}
+}
 static void CheckIfRoadVehNeedsService(Vehicle *v)
+{
 	/* If we already got a slot at a stop, use that FIRST, and go to a depot later */
 	if (v->u.road.slot != NULL || _patches.servint_roadveh == 0 || !VehicleNeedsService(v)) return;
@@ @@ -2005,14 +2010,12 @@ static void CheckIfRoadVehNeedsService(V @@
 	v->dest_tile = depot->xy;
 	InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
+}
 void RoadVehicle::OnNewDay()
+{
 	CommandCost cost(EXPENSES_ROADVEH_RUN);
 	if (!IsRoadVehFront(this)) return;
 	if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
 	if (this->u.road.blocked_ctr == 0) CheckVehicleBreakdown(this);
 	AgeVehicle(this);
@@ @@ -2024,16 +2027,14 @@ void RoadVehicle::OnNewDay() @@
 	if (this->current_order.type == OT_GOTO_STATION && this->u.road.slot != NULL && this->u.road.slot_age-- == 0) {
 		DEBUG(ms, 3, "Slot expired for vehicle %d (index %d) at stop 0x%X",
 			this->unitnumber, this->index, this->u.road.slot->xy);
 		ClearSlot(this);
+	}
 	if (this->vehstatus & VS_STOPPED) return;
 	/* update destination */
 	if (this->current_order.type == OT_GOTO_STATION && this->u.road.slot == NULL && !(this->vehstatus & VS_CRASHED)) {
+	if (!(this->vehstatus & VS_STOPPED) && this->current_order.type == OT_GOTO_STATION && this->u.road.slot == NULL && !(this->vehstatus & VS_CRASHED)) {
 		Station *st = GetStation(this->current_order.dest);
 		RoadStop *rs = st->GetPrimaryRoadStop(this);
 		RoadStop *best = NULL;
 		if (rs != NULL) {
 			/* We try to obtain a slot if:
@@ @@ -2085,15 +2086,18 @@ void RoadVehicle::OnNewDay() @@
 		} else {
 			DEBUG(ms, 4, "No road stop for vehicle %d (index %d) at station %d (0x%X)",
 					this->unitnumber, this->index, st->index, st->xy);
+		}
+	}
-	cost = CommandCost(EXPENSES_ROADVEH_RUN, RoadVehInfo(this->engine_type)->running_cost * _price.roadveh_running / 364);
+	if (this->running_ticks == 0) return;
 	this->profit_this_year -= cost.GetCost() >> 8;
 	CommandCost cost(EXPENSES_ROADVEH_RUN, RoadVehInfo(this->engine_type)->running_cost * _price.roadveh_running * this->running_ticks / (364 * DAY_TICKS));
 	this->profit_this_year -= cost.GetCost();
 	this->running_ticks = 0;
 	SubtractMoneyFromPlayerFract(this->owner, cost);
 	InvalidateWindow(WC_VEHICLE_DETAILS, this->index);
 	InvalidateWindowClasses(WC_ROADVEH_LIST);
+}

src/saveload.cpp

➞

Show inline comments

@@ @@ -31,13 +31,13 @@ @@
 #include "vehicle_base.h"
 #include "autoreplace_base.h"
 #include <list>
 #include "table/strings.h"
-extern const uint16 SAVEGAME_VERSION = 87;
+extern const uint16 SAVEGAME_VERSION = 88;
 uint16 _sl_version;       ///< the major savegame version identifier
 byte   _sl_minor_version; ///< the minor savegame version, DO NOT USE!
 typedef void WriterProc(uint len);
 typedef uint ReaderProc();

src/ship_cmd.cpp

➞

Show inline comments

@@ @@ -167,27 +167,27 @@ static void CheckIfShipNeedsService(Vehi @@
 	v->dest_tile = depot->xy;
 	InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
+}
 void Ship::OnNewDay()
+{
 	CommandCost cost(EXPENSES_SHIP_RUN);
 	if ((++this->day_counter & 7) == 0)
 		DecreaseVehicleValue(this);
 	CheckVehicleBreakdown(this);
 	AgeVehicle(this);
 	CheckIfShipNeedsService(this);
 	CheckOrders(this);
-	if (this->vehstatus & VS_STOPPED) return;
+	if (this->running_ticks == 0) return;
 	cost.AddCost(GetVehicleProperty(this, 0x0F, ShipVehInfo(this->engine_type)->running_cost) * _price.ship_running / 364);
 	this->profit_this_year -= cost.GetCost() >> 8;
 	CommandCost cost(EXPENSES_SHIP_RUN, GetVehicleProperty(this, 0x0F, ShipVehInfo(this->engine_type)->running_cost) * _price.ship_running * this->running_ticks / (364 * DAY_TICKS));
 	this->profit_this_year -= cost.GetCost();
 	this->running_ticks = 0;
 	SubtractMoneyFromPlayerFract(this->owner, cost);
 	InvalidateWindow(WC_VEHICLE_DETAILS, this->index);
 	/* we need this for the profit */
 	InvalidateWindowClasses(WC_SHIPS_LIST);
@@ @@ -778,12 +778,14 @@ static void AgeShipCargo(Vehicle *v) @@
 	if (_age_cargo_skip_counter != 0) return;
 	v->cargo.AgeCargo();
+}
 void Ship::Tick()
+{
 	if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
 	AgeShipCargo(this);
 	ShipController(this);
+}
 void ShipsYearlyLoop()
@@ @@ -840,12 +842,14 @@ CommandCost CmdBuildShip(TileIndex tile, @@
 		x = TileX(tile) * TILE_SIZE + TILE_SIZE / 2;
 		y = TileY(tile) * TILE_SIZE + TILE_SIZE / 2;
 		v->x_pos = x;
 		v->y_pos = y;
 		v->z_pos = GetSlopeZ(x, y);
 		v->running_ticks = 0;
 		v->UpdateDeltaXY(v->direction);
 		v->vehstatus = VS_HIDDEN | VS_STOPPED | VS_DEFPAL;
 		v->spritenum = svi->image_index;
 		v->cargo_type = svi->cargo_type;
 		v->cargo_subtype = 0;

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -732,12 +732,13 @@ CommandCost CmdBuildRailVehicle(TileInde @@
 			v->direction = DiagDirToDir(dir);
 			v->tile = tile;
 			v->owner = _current_player;
 			v->x_pos = x;
 			v->y_pos = y;
 			v->z_pos = GetSlopeZ(x, y);
 			v->running_ticks = 0;
 			v->u.rail.track = TRACK_BIT_DEPOT;
 			v->vehstatus = VS_HIDDEN | VS_STOPPED | VS_DEFPAL;
 			v->spritenum = rvi->image_index;
 			v->cargo_type = rvi->cargo_type;
 			v->cargo_subtype = 0;
 			v->cargo_cap = rvi->capacity;
@@ @@ -3592,12 +3593,13 @@ void Train::Tick() @@
+{
 	if (_age_cargo_skip_counter == 0) this->cargo.AgeCargo();
 	this->tick_counter++;
 	if (IsFrontEngine(this)) {
 		if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
 		this->current_order_time++;
 		TrainLocoHandler(this, false);
 		/* make sure vehicle wasn't deleted. */
 		if (this->type == VEH_TRAIN && IsFrontEngine(this))
@@ @@ -3662,17 +3664,18 @@ void Train::OnNewDay() @@
 		/* update destination */
 		if (this->current_order.type == OT_GOTO_STATION) {
 			TileIndex tile = GetStation(this->current_order.dest)->train_tile;
 			if (tile != 0) this->dest_tile = tile;
+		}
-		if ((this->vehstatus & VS_STOPPED) == 0) {
+		if (this->running_ticks != 0) {
 			/* running costs */
 			CommandCost cost(EXPENSES_TRAIN_RUN, this->GetRunningCost() / 364);
 			this->profit_this_year -= cost.GetCost() >> 8;
 			CommandCost cost(EXPENSES_TRAIN_RUN, this->GetRunningCost() * this->running_ticks / (364 * DAY_TICKS));
 			this->profit_this_year -= cost.GetCost();
 			this->running_ticks = 0;
 			SubtractMoneyFromPlayerFract(this->owner, cost);
 			InvalidateWindow(WC_VEHICLE_DETAILS, this->index);
 			InvalidateWindowClasses(WC_TRAINS_LIST);
+		}

src/vehicle.cpp

➞

Show inline comments

@@ @@ -2794,12 +2794,13 @@ static const SaveLoad _common_veh_desc[] @@
 	     SLE_VAR(Vehicle, cargo_cap,            SLE_UINT16),
 	SLEG_CONDVAR(         _cargo_count,         SLE_UINT16,                  0, 67),
 	 SLE_CONDLST(Vehicle, cargo,                REF_CARGO_PACKET,           68, SL_MAX_VERSION),
 	    SLE_VAR(Vehicle, day_counter,          SLE_UINT8),
 	    SLE_VAR(Vehicle, tick_counter,         SLE_UINT8),
 	SLE_CONDVAR(Vehicle, running_ticks,        SLE_UINT8,                   88, SL_MAX_VERSION),
 	    SLE_VAR(Vehicle, cur_order_index,      SLE_UINT8),
 	    SLE_VAR(Vehicle, num_orders,           SLE_UINT8),
 	/* This next line is for version 4 and prior compatibility.. it temporarily reads
 	    type and flags (which were both 4 bits) into type. Later on this is

src/vehicle_base.h

➞

Show inline comments

@@ @@ -246,14 +246,15 @@ public: @@
 	CargoID cargo_type;      // type of cargo this vehicle is carrying
 	uint16 cargo_cap;        // total capacity
 	byte cargo_subtype;      ///< Used for livery refits (NewGRF variations)
 	CargoList cargo;         ///< The cargo this vehicle is carrying
 	byte day_counter;        // increased by one for each day
 	byte tick_counter;       // increased by one for each tick
 	byte day_counter;        ///< Increased by one for each day
 	byte tick_counter;       ///< Increased by one for each tick
 	byte running_ticks;      ///< Number of ticks this vehicle was not stopped this day
 	/* Begin Order-stuff */
 	Order current_order;     ///< The current order (+ status, like: loading)
 	VehicleOrderID cur_order_index; ///< The index to the current order
 	Order *orders;           ///< Pointer to the first order for this vehicle
@@ @@ -288,14 +289,14 @@ public: @@
 	bool leave_depot_instantly; // NOSAVE: stores if the vehicle needs to leave the depot it just entered. Used by autoreplace
 	uint16 load_unload_time_rem;
 	byte vehicle_flags;         // Used for gradual loading and other miscellaneous things (@see VehicleFlags enum)
 	Money profit_this_year;
 	Money profit_last_year;
 	Money profit_this_year;        ///< Profit this year << 8, low 8 bits are fract
 	Money profit_last_year;        ///< Profit last year << 8, low 8 bits are fract
 	Money value;
 	GroupID group_id;              ///< Index of group Pool array
 	/* Used for timetabling. */
 	uint32 current_order_time;     ///< How many ticks have passed since this order started.

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -170,13 +170,13 @@ void DrawVehicleProfitButton(const Vehic @@
 	/* draw profit-based colored icons */
 	if (v->age <= 365 * 2) {
 		pal = PALETTE_TO_GREY;
 	} else if (v->profit_last_year < 0) {
 		pal = PALETTE_TO_RED;
 	} else if (v->profit_last_year < 10000) {
+	} else if (v->profit_last_year >> 8 < 10000) {
 		pal = PALETTE_TO_YELLOW;
 	} else {
 		pal = PALETTE_TO_GREEN;
+	}
 	DrawSprite(SPR_BLOT, pal, x, y);
+}
@@ @@ -595,13 +595,13 @@ static int CDECL VehicleProfitThisYearSo @@
+}
 static int CDECL VehicleProfitLastYearSorter(const void *a, const void *b)
+{
 	const Vehicle* va = *(const Vehicle**)a;
 	const Vehicle* vb = *(const Vehicle**)b;
 	int r = ClampToI32(va->profit_last_year - vb->profit_last_year);
+	int r = ClampToI32((va->profit_last_year - vb->profit_last_year) >> 8);
 	VEHICLEUNITNUMBERSORTER(r, va, vb);
 	return (_internal_sort_order & 1) ? -r : r;
+}
@@ @@ -980,14 +980,14 @@ static void DrawVehicleListWindow(Window @@
 	max = min(w->vscroll.pos + w->vscroll.cap, vl->l.list_length);
 	for (i = w->vscroll.pos; i < max; ++i) {
 		const Vehicle *v = vl->sort_list[i];
 		StringID str;
 		SetDParam(0, v->profit_this_year);
 		SetDParam(1, v->profit_last_year);
 		SetDParam(0, v->profit_this_year >> 8);
 		SetDParam(1, v->profit_last_year >> 8);
 		DrawVehicleImage(v, x + 19, y + 6, INVALID_VEHICLE, w->widget[VLW_WIDGET_LIST].right - w->widget[VLW_WIDGET_LIST].left - 20, 0);
 		DrawString(x + 19, y + w->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING);
 		if (v->name != NULL) {
 			/* The vehicle got a name so we will print it */
@@ @@ -1497,14 +1497,14 @@ static void DrawVehicleDetailsWindow(Win @@
 			break;
 		default: NOT_REACHED();
+	}
 	/* Draw profit */
 	SetDParam(0, v->profit_this_year);
 	SetDParam(1, v->profit_last_year);
 	SetDParam(0, v->profit_this_year >> 8);
 	SetDParam(1, v->profit_last_year >> 8);
 	DrawString(2, 35, _vehicle_translation_table[VST_VEHICLE_PROFIT_THIS_YEAR_LAST_YEAR][v->type], TC_FROMSTRING);
 	/* Draw breakdown & reliability */
 	SetDParam(0, v->reliability * 100 >> 16);
 	SetDParam(1, v->breakdowns_since_last_service);
 	DrawString(2, 45, _vehicle_translation_table[VST_VEHICLE_RELIABILITY_BREAKDOWNS][v->type], TC_FROMSTRING);

0 comments (0 inline, 0 general)