cpp/openttd-patchpack/source Changeset - r2755:f79097dcbd4a

Changeset - r2755:f79097dcbd4a

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

tron - 18 years ago 2005-12-14 06:49:54
tron@openttd.org

(svn r3300) Remove unreachable code - in this case some duplicate breaks

5 files changed with 8 insertions and 13 deletions:

aircraft_gui.c

main_gui.c

players.c

roadveh_gui.c

ship_gui.c

0 comments (0 inline, 0 general)

aircraft_gui.c

➞

Show inline comments

@@ @@ -830,13 +830,13 @@ static void AircraftDepotWndProc(Window @@
 	} break;
 	case WE_DESTROY:
 		DeleteWindowById(WC_BUILD_VEHICLE, w->window_number);
 		break;
-	case WE_DRAGDROP: {
 	case WE_DRAGDROP:
 		switch(e->click.widget) {
 		case 5: {
 			Vehicle *v;
 			VehicleID sel = WP(w,traindepot_d).sel;
 			WP(w,traindepot_d).sel = INVALID_VEHICLE;
@@ @@ -868,14 +868,12 @@ static void AircraftDepotWndProc(Window @@
 			break;
 		default:
 			WP(w,traindepot_d).sel = INVALID_VEHICLE;
 			SetWindowDirty(w);
+		}
 		break;
+	}
 	break;
 	case WE_RESIZE:
 		w->vscroll.cap += e->sizing.diff.y / 24;
 		w->hscroll.cap += e->sizing.diff.x / 74;
 		w->widget[5].unkA = (w->vscroll.cap << 8) + w->hscroll.cap;
 		break;

main_gui.c

➞

Show inline comments

@@ @@ -2087,13 +2087,13 @@ static void ScenEditToolbarWndProc(Windo @@
 	case WE_CLICK: {
 		if (_game_mode == GM_MENU) return;
 		_scen_toolbar_button_procs[e->click.widget](w);
 	} break;
-	case WE_KEYPRESS: {
 	case WE_KEYPRESS:
 		switch (e->keypress.keycode) {
 		case WKC_F1: ToolbarPauseClick(w); break;
 		case WKC_F2: ShowGameOptions(); break;
 		case WKC_F3: MenuClickSaveLoad(0); break;
 		case WKC_F4: ToolbarScenGenLand(w); break;
 		case WKC_F5: ToolbarScenGenTown(w); break;
@@ @@ -2103,14 +2103,14 @@ static void ScenEditToolbarWndProc(Windo @@
 		case WKC_F9: ToolbarScenPlaceSign(w); break;
 		case WKC_F10: ShowMusicWindow(); break;
 		case WKC_F11: PlaceLandBlockInfo(); break;
 		case WKC_CTRL | 'S': _make_screenshot = 1; break;
 		case WKC_CTRL | 'G': _make_screenshot = 2; break;
 		case 'L': ShowEditorTerraformToolBar(); break;
 		} break;
 	}	break;
+		}
 		break;
 	case WE_PLACE_OBJ: {
 		_place_proc(e->place.tile);
 	} break;
 	case WE_ABORT_PLACE_OBJ: {

players.c

➞

Show inline comments

@@ @@ -730,13 +730,14 @@ int32 CmdReplaceVehicle(int x, int y, ui @@
 					return CMD_ERROR;
 				return AddEngineReplacement(p, old_engine_type, new_engine_type, flags);
 			} else {
 				return RemoveEngineReplacement(p, old_engine_type, flags);
+			}
 		} break;
+		}
 		case 4:
 			if (flags & DC_EXEC) {
 				p->engine_renew = (bool)GB(p1, 15, 1);
 				p->engine_renew_months = (int16)GB(p1, 16, 16);
 				p->engine_renew_money = (uint32)p2;

roadveh_gui.c

➞

Show inline comments

@@ @@ -735,13 +735,13 @@ static void RoadDepotWndProc(Window *w, @@
 	} break;
 	case WE_DESTROY:
 		DeleteWindowById(WC_BUILD_VEHICLE, w->window_number);
 		break;
-	case WE_DRAGDROP: {
 	case WE_DRAGDROP:
 		switch(e->click.widget) {
 		case 5: {
 			Vehicle *v;
 			VehicleID sel = WP(w,traindepot_d).sel;
 			WP(w,traindepot_d).sel = INVALID_VEHICLE;
@@ @@ -773,14 +773,12 @@ static void RoadDepotWndProc(Window *w, @@
 			break;
 		default:
 			WP(w,traindepot_d).sel = INVALID_VEHICLE;
 			SetWindowDirty(w);
+		}
 		break;
+	}
 	break;
 	case WE_RESIZE: {
 		/* Update the scroll + matrix */
 		w->vscroll.cap += e->sizing.diff.y / 14;
 		w->hscroll.cap += e->sizing.diff.x / 56;
 		w->widget[5].unkA = (w->vscroll.cap << 8) + w->hscroll.cap;

ship_gui.c

➞

Show inline comments

@@ @@ -813,13 +813,13 @@ static void ShipDepotWndProc(Window* w, @@
 	} break;
 	case WE_DESTROY:
 		DeleteWindowById(WC_BUILD_VEHICLE, w->window_number);
 		break;
-	case WE_DRAGDROP: {
 	case WE_DRAGDROP:
 		switch(e->click.widget) {
 		case 5: {
 			Vehicle *v;
 			VehicleID sel = WP(w,traindepot_d).sel;
 			WP(w,traindepot_d).sel = INVALID_VEHICLE;
@@ @@ -851,14 +851,12 @@ static void ShipDepotWndProc(Window* w, @@
 			break;
 		default:
 			WP(w,traindepot_d).sel = INVALID_VEHICLE;
 			SetWindowDirty(w);
+		}
 		break;
+	}
 	break;
 	case WE_RESIZE:
 		w->vscroll.cap += e->sizing.diff.y / 24;
 		w->hscroll.cap += e->sizing.diff.x / 90;
 		w->widget[5].unkA = (w->vscroll.cap << 8) + w->hscroll.cap;
 		break;

0 comments (0 inline, 0 general)