summaryrefslogtreecommitdiff
path: root/roadveh_gui.c
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-06-10 08:37:41 +0000
committertron <tron@openttd.org>2006-06-10 08:37:41 +0000
commita2362674e33e66bf1d27df208db5b2250a01012e (patch)
treeddcc7798b94be03152e4b31cee4bf48bc73774e4 /roadveh_gui.c
parentfee9ee2c05a107e458c20e8773c9adce38a54a4c (diff)
downloadopenttd-a2362674e33e66bf1d27df208db5b2250a01012e.tar.xz
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
Diffstat (limited to 'roadveh_gui.c')
-rw-r--r--roadveh_gui.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/roadveh_gui.c b/roadveh_gui.c
index 88b525aa2..714215c46 100644
--- a/roadveh_gui.c
+++ b/roadveh_gui.c
@@ -415,10 +415,9 @@ static void RoadVehViewWndProc(Window *w, WindowEvent *e)
case WE_MOUSELOOP:
{
- Vehicle *v;
- uint32 h;
- v = GetVehicle(w->window_number);
- h = IsRoadVehInDepotStopped(v) ? (1 << 7) | (1 << 8) : (1 << 11) | (1 << 12);
+ const Vehicle* v = GetVehicle(w->window_number);
+ uint32 h = IsRoadVehInDepotStopped(v) ? 1 << 7 | 1 << 8 : 1 << 11 | 1 << 12;
+
if (h != w->hidden_state) {
w->hidden_state = h;
SetWindowDirty(w);
@@ -1007,10 +1006,11 @@ static void PlayerRoadVehWndProc(Window *w, WindowEvent *e)
DrawVehicleProfitButton(v, x, y + 13);
SetDParam(0, v->unitnumber);
- if (IsRoadVehInDepot(v))
+ if (IsRoadVehInDepot(v)) {
str = STR_021F;
- else
+ } else {
str = v->age > v->max_age - 366 ? STR_00E3 : STR_00E2;
+ }
DrawString(x, y + 2, str, 0);
SetDParam(0, v->profit_this_year);