diff options
author | tron <tron@openttd.org> | 2005-11-14 19:48:04 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-11-14 19:48:04 +0000 |
commit | f7abff5f963cddfdd134ac52ffd8e72e3ed88f0c (patch) | |
tree | a9ba5d4f3c5c47ab3857060c5f95ed482530ed97 /road_gui.c | |
parent | d8b56c123eab7f7b48f2af3579130e366f6106ab (diff) | |
download | openttd-f7abff5f963cddfdd134ac52ffd8e72e3ed88f0c.tar.xz |
(svn r3181) -Bracing
-Indentation
-Whitespace
-DeMorgan's Law
-Test with NULL or 0 for non-booleans
-'\0' instead of 0 for chars
-Remove redundantly redundant comments (like DoFoo(); // Do foo)
-Join multiple short lines with a single statement
-Split single lines with multiple statements
-Avoid assignments in if
Diffstat (limited to 'road_gui.c')
-rw-r--r-- | road_gui.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/road_gui.c b/road_gui.c index dbb0ea1af..448617ecd 100644 --- a/road_gui.c +++ b/road_gui.c @@ -171,7 +171,7 @@ static void BuildRoadClick_Landscaping(Window *w) ShowTerraformToolbar(); } -static OnButtonClick * const _build_road_button_proc[] = { +static OnButtonClick* const _build_road_button_proc[] = { BuildRoadClick_NE, BuildRoadClick_NW, BuildRoadClick_Demolish, @@ -184,8 +184,9 @@ static OnButtonClick * const _build_road_button_proc[] = { BuildRoadClick_Landscaping, }; -static void BuildRoadToolbWndProc(Window *w, WindowEvent *e) { - switch(e->event) { +static void BuildRoadToolbWndProc(Window* w, WindowEvent* e) +{ + switch (e->event) { case WE_PAINT: w->disabled_state &= ~(1 << 11); if (!(w->click_state & ((1<<3)|(1<<4)))) { @@ -196,8 +197,7 @@ static void BuildRoadToolbWndProc(Window *w, WindowEvent *e) { break; case WE_CLICK: { - if (e->click.widget >= 3) - _build_road_button_proc[e->click.widget - 3](w); + if (e->click.widget >= 3) _build_road_button_proc[e->click.widget - 3](w); } break; case WE_KEYPRESS: @@ -228,11 +228,11 @@ static void BuildRoadToolbWndProc(Window *w, WindowEvent *e) { SetWindowDirty(w); w = FindWindowById(WC_BUS_STATION, 0); - if (w != NULL) WP(w,def_d).close=true; + if (w != NULL) WP(w,def_d).close = true; w = FindWindowById(WC_TRUCK_STATION, 0); - if (w != NULL) WP(w,def_d).close=true; + if (w != NULL) WP(w,def_d).close = true; w = FindWindowById(WC_BUILD_DEPOT, 0); - if (w != NULL) WP(w,def_d).close=true; + if (w != NULL) WP(w,def_d).close = true; break; case WE_PLACE_DRAG: { @@ -351,16 +351,17 @@ void ShowBuildRoadScenToolbar(void) AllocateWindowDescFront(&_build_road_scen_desc, 0); } -static void BuildRoadDepotWndProc(Window *w, WindowEvent *e) { - switch(e->event) { +static void BuildRoadDepotWndProc(Window* w, WindowEvent* e) +{ + switch (e->event) { case WE_PAINT: w->click_state = (1<<3) << _road_depot_orientation; DrawWindowWidgets(w); DrawRoadDepotSprite(70, 17, 0); DrawRoadDepotSprite(70, 69, 1); - DrawRoadDepotSprite(2, 69, 2); - DrawRoadDepotSprite(2, 17, 3); + DrawRoadDepotSprite( 2, 69, 2); + DrawRoadDepotSprite( 2, 17, 3); break; case WE_CLICK: { @@ -374,13 +375,11 @@ static void BuildRoadDepotWndProc(Window *w, WindowEvent *e) { } break; case WE_MOUSELOOP: - if (WP(w,def_d).close) - DeleteWindow(w); + if (WP(w,def_d).close) DeleteWindow(w); break; case WE_DESTROY: - if (!WP(w,def_d).close) - ResetObjectToPlace(); + if (!WP(w,def_d).close) ResetObjectToPlace(); break; } } @@ -466,8 +465,7 @@ static void RoadStationPickerWndProc(Window *w, WindowEvent *e) } break; case WE_DESTROY: - if (!WP(w,def_d).close) - ResetObjectToPlace(); + if (!WP(w,def_d).close) ResetObjectToPlace(); break; } } |