dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12197) -Fix [FS#1788](r12134): show correct last year profit when the train had negative income

Browse Source 
-Codechange: use GetDisplayProfitThisYear() to convert vehicle profit to readable form
This commit is contained in:
smatz
2008-02-20 17:06:58 +00:00
parent 2657090b1f
commit 9bdb194b2a
8 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ai/default/default.cpp
View File

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

2
src/ai/trolly/trolly.cpp
View File

@@ -1251,7 +1251,7 @@ static void AiNew_CheckVehicle(Player *p, Vehicle *v)
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) >> 8 < AI_MINIMUM_ROUTE_PROFIT ||
if (v->profit_last_year + v->profit_this_year < (Money)256 * 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) {