cpp/openttd-patchpack/source Changeset - r8333:d7d793bb19a8

Changeset - r8333:d7d793bb19a8

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 17 years ago 2008-01-17 17:35:59
frosch@openttd.org

(svn r11899) -Cleanup: Remove ShowReplaceVehicleWindow() as it is basically a duplicate of ShowReplaceGroupVehicleWindow().

3 files changed with 1 insertions and 34 deletions:

src/autoreplace_gui.cpp

src/autoreplace_gui.h

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/autoreplace_gui.cpp

➞

Show inline comments

@@ @@ -506,38 +506,6 @@ static const WindowDesc _replace_ship_ai @@
 };
 void ShowReplaceVehicleWindow(VehicleType vehicletype)
+{
 	Window *w;
 	DeleteWindowById(WC_REPLACE_VEHICLE, vehicletype);
 	switch (vehicletype) {
 		case VEH_TRAIN:
 			w = AllocateWindowDescFront(&_replace_rail_vehicle_desc, vehicletype);
 			w->vscroll.cap  = 8;
 			w->resize.step_height = 14;
 			WP(w, replaceveh_d).wagon_btnstate = true;
 			break;
 		case VEH_ROAD:
 			w = AllocateWindowDescFront(&_replace_road_vehicle_desc, vehicletype);
 			w->vscroll.cap  = 8;
 			w->resize.step_height = 14;
 			break;
 		case VEH_SHIP:
 		case VEH_AIRCRAFT:
 			w = AllocateWindowDescFront(&_replace_ship_aircraft_vehicle_desc, vehicletype);
 			w->vscroll.cap  = 4;
 			w->resize.step_height = 24;
 			break;
 		default: return;
+	}
 	w->caption_color = _local_player;
 	w->vscroll2.cap = w->vscroll.cap;   // these two are always the same
 	WP(w, replaceveh_d).sel_group = DEFAULT_GROUP;
+ }
 void ShowReplaceGroupVehicleWindow(GroupID id_g, VehicleType vehicletype)
+{
 	Window *w;

src/autoreplace_gui.h

➞

Show inline comments

@@ @@ -13,7 +13,6 @@ @@
  */
 void AddRemoveEngineFromAutoreplaceAndBuildWindows(VehicleType type);
 void InvalidateAutoreplaceWindow(EngineID e, GroupID id_g);
 void ShowReplaceVehicleWindow(VehicleType vehicletype);
 void ShowReplaceGroupVehicleWindow(GroupID group, VehicleType veh);
 #endif /* AUTOREPLACE_GUI_H */

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -1125,7 +1125,7 @@ void PlayerVehWndProc(Window *w, WindowE @@
 					switch (e->we.dropdown.index) {
 						case 0: /* Replace window */
-							ShowReplaceVehicleWindow(vl->vehicle_type);
+							ShowReplaceGroupVehicleWindow(DEFAULT_GROUP, vl->vehicle_type);
 							break;
 						case 1: /* Send for servicing */
 							DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */,

0 comments (0 inline, 0 general)