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

@@ @@ -824,25 +824,25 @@ static void AircraftDepotWndProc(Window @@
 		// since OTTD checks all open depot windows, we will make sure that it triggers the one with a clicked clone button
 		if (v != NULL && HASBIT(w->click_state, 8)) {
 			_place_clicked_vehicle = NULL;
 			HandleCloneVehClick(v, 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;
 			SetWindowDirty(w);
 			if (GetVehicleFromAircraftDepotWndPt(w, e->dragdrop.pt.x, e->dragdrop.pt.y, &v) == 0 &&
 					v != NULL &&
 					sel == v->index) {
 				ShowAircraftViewWindow(v);
@@ @@ -862,26 +862,24 @@ static void AircraftDepotWndProc(Window @@
 				_backup_orders_tile = v->tile;
 				BackupVehicleOrders(v, _backup_orders_data);
 				if (!DoCommandP(v->tile, v->index, 0, NULL,  CMD_SELL_AIRCRAFT | CMD_MSG(STR_A01C_CAN_T_SELL_AIRCRAFT)))
 					_backup_orders_tile = 0;
+			}
 			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;
+	}
+}
 static const Widget _aircraft_depot_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,									STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,    14,    11,   318,     0,    13, STR_A002_AIRCRAFT_HANGAR,	STR_018C_WINDOW_TITLE_DRAG_THIS},

main_gui.c

➞

Show inline comments

@@ @@ -2081,42 +2081,42 @@ static void ScenEditToolbarWndProc(Windo @@
 		SetDParam(0, _date);
 		DrawStringCentered(161, 1, STR_0221_OPENTTD, 0);
 		DrawStringCentered(161, 11,STR_0222_SCENARIO_EDITOR, 0);
 		break;
 	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;
 		case WKC_F6: ToolbarScenGenIndustry(w); break;
 		case WKC_F7: ToolbarScenBuildRoad(w); break;
 		case WKC_F8: ToolbarScenPlantTrees(w); break;
 		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: {
 		w->click_state &= ~(1<<25);
 		SetWindowDirty(w);
 	} break;
 	case WE_ON_EDIT_TEXT: HandleOnEditText(e); break;

players.c

➞

Show inline comments

@@ @@ -724,25 +724,26 @@ int32 CmdReplaceVehicle(int x, int y, ui @@
 				// make sure that we do not replace a plane with a helicopter or vise versa
 				if (GetEngine(new_engine_type)->type == VEH_Aircraft && HASBIT(AircraftVehInfo(old_engine_type)->subtype, 0) != HASBIT(AircraftVehInfo(new_engine_type)->subtype, 0))
 					return CMD_ERROR;
 				// make sure that the player can actually buy the new engine
 				if (!HASBIT(GetEngine(new_engine_type)->player_avail, _current_player))
 					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;
 				if (IsLocalPlayer()) {
 					_patches.autorenew = p->engine_renew;
 					_patches.autorenew_months = p->engine_renew_months;
 					_patches.autorenew_money = p->engine_renew_money;
 					InvalidateWindow(WC_GAME_OPTIONS, 0);
+				}

roadveh_gui.c

➞

Show inline comments

@@ @@ -729,25 +729,25 @@ static void RoadDepotWndProc(Window *w, @@
 		// since OTTD checks all open depot windows, we will make sure that it triggers the one with a clicked clone button
 		if (v != NULL && HASBIT(w->click_state, 8)) {
 			_place_clicked_vehicle = NULL;
 			HandleCloneVehClick(v, 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;
 			SetWindowDirty(w);
 			if (GetVehicleFromRoadDepotWndPt(w, e->dragdrop.pt.x, e->dragdrop.pt.y, &v) == 0 &&
 					v != NULL &&
 					sel == v->index) {
 				ShowRoadVehViewWindow(v);
@@ @@ -767,26 +767,24 @@ static void RoadDepotWndProc(Window *w, @@
 				_backup_orders_tile = v->tile;
 				BackupVehicleOrders(v, _backup_orders_data);
 				if (!DoCommandP(v->tile, v->index, 0, NULL, CMD_SELL_ROAD_VEH | CMD_MSG(STR_9014_CAN_T_SELL_ROAD_VEHICLE)))
 					_backup_orders_tile = 0;
+			}
 			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;
 	} break;
+	}
+}

ship_gui.c

➞

Show inline comments

@@ @@ -807,25 +807,25 @@ static void ShipDepotWndProc(Window* w, @@
 		// since OTTD checks all open depot windows, we will make sure that it triggers the one with a clicked clone button
 		if (v != NULL && HASBIT(w->click_state, 8)) {
 			_place_clicked_vehicle = NULL;
 			HandleCloneVehClick(v, 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;
 			SetWindowDirty(w);
 			if (GetVehicleFromShipDepotWndPt(w, e->dragdrop.pt.x, e->dragdrop.pt.y, &v) == 0 &&
 					v != NULL &&
 					sel == v->index) {
 				ShowShipViewWindow(v);
@@ @@ -845,26 +845,24 @@ static void ShipDepotWndProc(Window* w, @@
 				_backup_orders_tile = v->tile;
 				BackupVehicleOrders(v, _backup_orders_data);
 				if (!DoCommandP(v->tile, v->index, 0, NULL, CMD_SELL_SHIP | CMD_MSG(STR_980C_CAN_T_SELL_SHIP)))
 					_backup_orders_tile = 0;
+			}
 			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;
+	}
+}
 static const Widget _ship_depot_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,    14,    11,   292,     0,    13, STR_9803_SHIP_DEPOT,		STR_018C_WINDOW_TITLE_DRAG_THIS},

0 comments (0 inline, 0 general)