cpp/openttd-patchpack/source Changeset - r9396:9c082e37fcdf

Changeset - r9396:9c082e37fcdf

Parent rev.

Child rev.

[Not reviewed]

master

0 6 2

peter1138 - 16 years ago 2008-05-28 11:56:21
peter1138@openttd.org

(svn r13307) -Codechange: Separate VehicleList and its two functions so only the 3 users include it, reducing dependencies on misc/smallvec.h

8 files changed with 164 insertions and 136 deletions:

source.list

src/depot_gui.cpp

src/vehicle.cpp

131

src/vehicle_func.h

src/vehicle_gui.cpp

src/vehicle_type.h

src/vehiclelist.cpp

144

src/vehiclelist.h

0 comments (0 inline, 0 general)

source.list

➞

Show inline comments

@@ @@ -109,12 +109,13 @@ tile_map.cpp @@
 		#else
 			unix.cpp
 		#end
 	#end
 #end
 vehicle.cpp
 vehiclelist.cpp
 viewport.cpp
 waypoint.cpp
 widget.cpp
 #if WIN32
 	win32.cpp
 #end
@@ @@ -321,12 +322,13 @@ tunnelbridge.h @@
 unmovable.h
 variables.h
 vehicle_base.h
 vehicle_func.h
 vehicle_gui.h
 vehicle_type.h
 vehiclelist.h
 viewport_func.h
 viewport_type.h
 waypoint.h
 waypoint_type.h
 music/win32_m.h
 sound/win32_s.h

src/depot_gui.cpp

➞

Show inline comments

@@ @@ -23,12 +23,13 @@ @@
 #include "vehicle_func.h"
 #include "player_func.h"
 #include "order_func.h"
 #include "depot_base.h"
 #include "tilehighlight_func.h"
 #include "window_gui.h"
 #include "vehiclelist.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 /*
  * Since all depot window sizes aren't the same, we need to modify sizes a little.

src/vehicle.cpp

➞

Show inline comments

@@ @@ -48,12 +48,13 @@ @@
 #include "settings_type.h"
 #include "oldpool_func.h"
 #include "depot_map.h"
 #include "animated_tile_func.h"
 #include "effectvehicle_base.h"
 #include "core/alloc_func.hpp"
 #include "vehiclelist.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #define INVALID_COORD (0x7fffffff)
 #define GEN_HASH(x, y) ((GB((y), 6, 6) << 6) + GB((x), 7, 6))
@@ @@ -1289,143 +1290,12 @@ CommandCost CmdCloneVehicle(TileIndex ti @@
+	}
 	return total_cost;
+}
 /**
  * Generate a list of vehicles inside a depot.
  * @param type    Type of vehicle
  * @param tile    The tile the depot is located on
  * @param engines Pointer to list to add vehicles to
  * @param wagons  Pointer to list to add wagons to (can be NULL)
  */
 void BuildDepotVehicleList(VehicleType type, TileIndex tile, VehicleList *engines, VehicleList *wagons)
+{
 	engines->Clear();
 	if (wagons != NULL && wagons != engines) wagons->Clear();
 	const Vehicle *v;
 	FOR_ALL_VEHICLES(v) {
 		/* General tests for all vehicle types */
 		if (v->type != type) continue;
 		if (v->tile != tile) continue;
 		switch (type) {
 			case VEH_TRAIN:
 				if (v->u.rail.track != TRACK_BIT_DEPOT) continue;
 				if (wagons != NULL && IsFreeWagon(v)) {
 					*wagons->Append() = v;
 					continue;
+				}
 				break;
 			default:
 				if (!v->IsInDepot()) continue;
 				break;
+		}
 		if (!v->IsPrimaryVehicle()) continue;
 		*engines->Append() = v;
+	}
 	/* Ensure the lists are not wasting too much space. If the lists are fresh
 	 * (i.e. built within a command) then this will actually do nothing. */
 	engines->Compact();
 	if (wagons != NULL && wagons != engines) wagons->Compact();
+}
 /**
  * Generate a list of vehicles based on window type.
  * @param list        Pointer to list to add vehicles to
  * @param type        Type of vehicle
  * @param owner       Player to generate list for
  * @param index       This parameter has different meanings depending on window_type
  *    <ul>
  *      <li>VLW_STATION_LIST:  index of station to generate a list for</li>
  *      <li>VLW_SHARED_ORDERS: index of order to generate a list for<li>
  *      <li>VLW_STANDARD: not used<li>
  *      <li>VLW_DEPOT_LIST: TileIndex of the depot/hangar to make the list for</li>
  *      <li>VLW_GROUP_LIST: index of group to generate a list for</li>
  *    </ul>
  * @param window_type The type of window the list is for, using the VLW_ flags in vehicle_gui.h
  */
 void GenerateVehicleSortList(VehicleList *list, VehicleType type, PlayerID owner, uint32 index, uint16 window_type)
+{
 	list->Clear();
 	const Vehicle *v;
 	switch (window_type) {
 		case VLW_STATION_LIST:
 			FOR_ALL_VEHICLES(v) {
 				if (v->type == type && v->IsPrimaryVehicle()) {
 					const Order *order;
 					FOR_VEHICLE_ORDERS(v, order) {
 						if (order->IsType(OT_GOTO_STATION) && order->GetDestination() == index) {
 							*list->Append() = v;
 							break;
+						}
+					}
+				}
+			}
 			break;
 		case VLW_SHARED_ORDERS:
 			FOR_ALL_VEHICLES(v) {
 				/* Find a vehicle with the order in question */
 				if (v->orders != NULL && v->orders->index == index) {
 					/* Add all vehicles from this vehicle's shared order list */
 					for (v = GetFirstVehicleFromSharedList(v); v != NULL; v = v->next_shared) {
 						*list->Append() = v;
+					}
 					break;
+				}
+			}
 			break;
 		case VLW_STANDARD:
 			FOR_ALL_VEHICLES(v) {
 				if (v->type == type && v->owner == owner && v->IsPrimaryVehicle()) {
 					*list->Append() = v;
+				}
+			}
 			break;
 		case VLW_DEPOT_LIST:
 			FOR_ALL_VEHICLES(v) {
 				if (v->type == type && v->IsPrimaryVehicle()) {
 					const Order *order;
 					FOR_VEHICLE_ORDERS(v, order) {
 						if (order->IsType(OT_GOTO_DEPOT) && order->GetDestination() == index) {
 							*list->Append() = v;
 							break;
+						}
+					}
+				}
+			}
 			break;
 		case VLW_GROUP_LIST:
 			FOR_ALL_VEHICLES(v) {
 				if (v->type == type && v->IsPrimaryVehicle() &&
 						v->owner == owner && v->group_id == index) {
 					*list->Append() = v;
+				}
+			}
 			break;
 		default: NOT_REACHED(); break;
+	}
 	list->Compact();
+}
 /**
  * Send all vehicles of type to depots
  * @param type type of vehicle
  * @param flags the flags used for DoCommand()
  * @param service should the vehicles only get service in the depots
  * @param owner PlayerID of owner of the vehicles to send
  * @param vlw_flag tells what kind of list requested the goto depot

src/vehicle_func.h

➞

Show inline comments

@@ @@ -65,14 +65,12 @@ void MarkSingleVehicleDirty(const Vehicl @@
 UnitID GetFreeUnitNumber(VehicleType type);
 void TrainConsistChanged(Vehicle *v);
 void TrainPowerChanged(Vehicle *v);
 Money GetTrainRunningCost(const Vehicle *v);
 void GenerateVehicleSortList(VehicleList *list, VehicleType type, PlayerID owner, uint32 index, uint16 window_type);
 void BuildDepotVehicleList(VehicleType type, TileIndex tile, VehicleList *engine_list, VehicleList *wagon_list);
 CommandCost SendAllVehiclesToDepot(VehicleType type, uint32 flags, bool service, PlayerID owner, uint16 vlw_flag, uint32 id);
 void VehicleEnterDepot(Vehicle *v);
 CommandCost MaybeReplaceVehicle(Vehicle *v, uint32 flags, bool display_costs);
 bool CanBuildVehicleInfrastructure(VehicleType type);

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -33,12 +33,13 @@ @@
 #include "core/alloc_func.hpp"
 #include "string_func.h"
 #include "settings_type.h"
 #include "widgets/dropdown_func.h"
 #include "order_func.h"
 #include "timetable.h"
 #include "vehiclelist.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 Sorting _sorting;
 static bool   _internal_sort_order;     // descending/ascending

src/vehicle_type.h

➞

Show inline comments

@@ @@ -3,13 +3,12 @@ @@
 /** @file vehicle_type.h Types related to vehicles. */
 #ifndef VEHICLE_TYPE_H
 #define VEHICLE_TYPE_H
 #include "core/enum_type.hpp"
 #include "misc/smallvec.h"
 typedef uint16 VehicleID;
 enum VehicleType {
 	VEH_TRAIN,
 	VEH_ROAD,
@@ @@ -54,9 +53,7 @@ enum DepotCommand { @@
 	DEPOT_MASS_SEND     = (1 << 1), ///< Tells that it's a mass send to depot command (type in VLW flag)
 	DEPOT_DONT_CANCEL   = (1 << 2), ///< Don't cancel current goto depot command if any
 	DEPOT_LOCATE_HANGAR = (1 << 3), ///< Find another airport if the target one lacks a hangar
 	DEPOT_COMMAND_MASK  = 0xF,
 };
 typedef SmallVector<const Vehicle*, 32> VehicleList;
 #endif /* VEHICLE_TYPE_H */

src/vehiclelist.cpp

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 /** @file vehicle.cpp Base implementations of all vehicles. */
 #include "stdafx.h"
 #include "openttd.h"
 #include "vehicle_type.h"
 #include "vehicle_func.h"
 #include "vehicle_base.h"
 #include "vehicle_gui.h"
 #include "core/alloc_func.hpp"
 #include "train.h"
 #include "vehiclelist.h"
 /**
  * Generate a list of vehicles inside a depot.
  * @param type    Type of vehicle
  * @param tile    The tile the depot is located on
  * @param engines Pointer to list to add vehicles to
  * @param wagons  Pointer to list to add wagons to (can be NULL)
  */
 void BuildDepotVehicleList(VehicleType type, TileIndex tile, VehicleList *engines, VehicleList *wagons)
+{
 	engines->Clear();
 	if (wagons != NULL && wagons != engines) wagons->Clear();
 	const Vehicle *v;
 	FOR_ALL_VEHICLES(v) {
 		/* General tests for all vehicle types */
 		if (v->type != type) continue;
 		if (v->tile != tile) continue;
 		switch (type) {
 			case VEH_TRAIN:
 				if (v->u.rail.track != TRACK_BIT_DEPOT) continue;
 				if (wagons != NULL && IsFreeWagon(v)) {
 					*wagons->Append() = v;
 					continue;
+				}
 				break;
 			default:
 				if (!v->IsInDepot()) continue;
 				break;
+		}
 		if (!v->IsPrimaryVehicle()) continue;
 		*engines->Append() = v;
+	}
 	/* Ensure the lists are not wasting too much space. If the lists are fresh
 	 * (i.e. built within a command) then this will actually do nothing. */
 	engines->Compact();
 	if (wagons != NULL && wagons != engines) wagons->Compact();
+}
 /**
  * Generate a list of vehicles based on window type.
  * @param list        Pointer to list to add vehicles to
  * @param type        Type of vehicle
  * @param owner       Player to generate list for
  * @param index       This parameter has different meanings depending on window_type
  *    <ul>
  *      <li>VLW_STATION_LIST:  index of station to generate a list for</li>
  *      <li>VLW_SHARED_ORDERS: index of order to generate a list for<li>
  *      <li>VLW_STANDARD: not used<li>
  *      <li>VLW_DEPOT_LIST: TileIndex of the depot/hangar to make the list for</li>
  *      <li>VLW_GROUP_LIST: index of group to generate a list for</li>
  *    </ul>
  * @param window_type The type of window the list is for, using the VLW_ flags in vehicle_gui.h
  */
 void GenerateVehicleSortList(VehicleList *list, VehicleType type, PlayerID owner, uint32 index, uint16 window_type)
+{
 	list->Clear();
 	const Vehicle *v;
 	switch (window_type) {
 		case VLW_STATION_LIST:
 			FOR_ALL_VEHICLES(v) {
 				if (v->type == type && v->IsPrimaryVehicle()) {
 					const Order *order;
 					FOR_VEHICLE_ORDERS(v, order) {
 						if (order->IsType(OT_GOTO_STATION) && order->GetDestination() == index) {
 							*list->Append() = v;
 							break;
+						}
+					}
+				}
+			}
 			break;
 		case VLW_SHARED_ORDERS:
 			FOR_ALL_VEHICLES(v) {
 				/* Find a vehicle with the order in question */
 				if (v->orders != NULL && v->orders->index == index) {
 					/* Add all vehicles from this vehicle's shared order list */
 					for (v = GetFirstVehicleFromSharedList(v); v != NULL; v = v->next_shared) {
 						*list->Append() = v;
+					}
 					break;
+				}
+			}
 			break;
 		case VLW_STANDARD:
 			FOR_ALL_VEHICLES(v) {
 				if (v->type == type && v->owner == owner && v->IsPrimaryVehicle()) {
 					*list->Append() = v;
+				}
+			}
 			break;
 		case VLW_DEPOT_LIST:
 			FOR_ALL_VEHICLES(v) {
 				if (v->type == type && v->IsPrimaryVehicle()) {
 					const Order *order;
 					FOR_VEHICLE_ORDERS(v, order) {
 						if (order->IsType(OT_GOTO_DEPOT) && order->GetDestination() == index) {
 							*list->Append() = v;
 							break;
+						}
+					}
+				}
+			}
 			break;
 		case VLW_GROUP_LIST:
 			FOR_ALL_VEHICLES(v) {
 				if (v->type == type && v->IsPrimaryVehicle() &&
 						v->owner == owner && v->group_id == index) {
 					*list->Append() = v;
+				}
+			}
 			break;
 		default: NOT_REACHED(); break;
+	}
 	list->Compact();
+}

src/vehiclelist.h

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 /** @file vehiclelist.h Functions and type for generating vehicle lists. */
 #ifndef VEHICLELIST_H
 #define VEHICLELIST_H
 #include "misc/smallvec.h"
 typedef SmallVector<const Vehicle *, 32> VehicleList;
 void GenerateVehicleSortList(VehicleList *list, VehicleType type, PlayerID owner, uint32 index, uint16 window_type);
 void BuildDepotVehicleList(VehicleType type, TileIndex tile, VehicleList *engine_list, VehicleList *wagon_list);
 #endif /* VEHICLELIST_H */

0 comments (0 inline, 0 general)