summaryrefslogtreecommitdiff
path: root/ship_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
commit0a72639c2d7254c37cd6f8ab0a9fa0f4d63fd2ea (patch)
treeddcc7798b94be03152e4b31cee4bf48bc73774e4 /ship_gui.c
parent15c945c9263ffd64f01fd3da92fcb4efb17fe691 (diff)
downloadopenttd-0a72639c2d7254c37cd6f8ab0a9fa0f4d63fd2ea.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 'ship_gui.c')
-rw-r--r--ship_gui.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ship_gui.c b/ship_gui.c
index 6b78ecc41..72873bd22 100644
--- a/ship_gui.c
+++ b/ship_gui.c
@@ -564,10 +564,9 @@ static void ShipViewWndProc(Window *w, WindowEvent *e) {
case WE_MOUSELOOP:
{
- Vehicle *v;
- uint32 h;
- v = GetVehicle(w->window_number);
- h = IsShipInDepot(v) ? 1 << 7 : 1 << 11;
+ const Vehicle* v = GetVehicle(w->window_number);
+ uint32 h = IsShipInDepot(v) ? 1 << 7 : 1 << 11;
+
if (h != w->hidden_state) {
w->hidden_state = h;
SetWindowDirty(w);
@@ -1012,10 +1011,11 @@ static void PlayerShipsWndProc(Window *w, WindowEvent *e)
DrawVehicleProfitButton(v, x, y + 13);
SetDParam(0, v->unitnumber);
- if (IsShipInDepot(v))
+ if (IsShipInDepot(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);