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

(svn r15077) -Codechange: enumify DAYS_IN_YEAR and DAYS_IN_LEAP_YEAR

Browse Source 
-Change: when computing daily running cost, divide by 365 (instead of 364). Since r12134, the rounding errors don't need this correction anymore
This commit is contained in:
smatz
2009-01-13 22:58:03 +00:00
parent 5b4da28594
commit ca45774160
20 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vehicle_gui.cpp
View File

@@ -124,7 +124,7 @@ void DrawVehicleProfitButton(const Vehicle *v, int x, int y)
SpriteID pal;
/* draw profit-based colored icons */
if (v->age <= 365 * 2) {
if (v->age <= DAYS_IN_YEAR * 2) {
pal = PALETTE_TO_GREY;
} else if (v->GetDisplayProfitLastYear() < 0) {
pal = PALETTE_TO_RED;
@@ -783,7 +783,7 @@ void BaseVehicleListWindow::DrawVehicleListItems(int x, VehicleID selected_vehic
if (v->IsInDepot()) {
str = STR_021F;
} else {
str = (v->age > v->max_age - 366) ? STR_00E3 : STR_00E2;
str = (v->age > v->max_age - DAYS_IN_LEAP_YEAR) ? STR_00E3 : STR_00E2;
}
SetDParam(0, v->unitnumber);
@@ -1412,9 +1412,9 @@ struct VehicleDetailsWindow : Window {
this->DrawWidgets();
/* Draw running cost */
SetDParam(1, v->age / 366);
SetDParam(0, (v->age + 365 < v->max_age) ? STR_AGE : STR_AGE_RED);
SetDParam(2, v->max_age / 366);
SetDParam(1, v->age / DAYS_IN_LEAP_YEAR);
SetDParam(0, (v->age + DAYS_IN_YEAR < v->max_age) ? STR_AGE : STR_AGE_RED);
SetDParam(2, v->max_age / DAYS_IN_LEAP_YEAR);
SetDParam(3, v->GetDisplayRunningCost());
DrawString(2, 15, _vehicle_translation_table[VST_VEHICLE_AGE_RUNNING_COST_YR][v->type], TC_FROMSTRING);