cpp/openttd-patchpack/source Changeset - r14694:7cb8c9b7e219

Changeset - r14694:7cb8c9b7e219

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

alberth - 15 years ago 2010-02-28 10:44:53
alberth@openttd.org

(svn r19288) -Codechange: Move EnsureNoVehicleOnGround() and HasVehicleOnTunnelBridge() functions.

1 file changed with 49 insertions and 49 deletions:

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/vehicle.cpp

➞

Show inline comments

@@ @@ -215,61 +215,12 @@ void ShowNewGrfVehicleError(EngineID eng @@
 	SetDParam(1, engine);
 	GetString(buffer, part2, lastof(buffer));
 	DEBUG(grf, 0, "%s", buffer + 3);
+}
 /** Callback that returns 'real' vehicles lower or at height \c *(byte*)data .
  * @param v Vehicle to examine.
  * @param data Pointer to height data.
  * @return \a v if conditions are met, else \c NULL.
  */
 static Vehicle *EnsureNoVehicleProcZ(Vehicle *v, void *data)
+{
 	byte z = *(byte*)data;
 	if (v->type == VEH_DISASTER || (v->type == VEH_AIRCRAFT && v->subtype == AIR_SHADOW)) return NULL;
 	if (v->z_pos > z) return NULL;
 	_error_message = STR_ERROR_TRAIN_IN_THE_WAY + v->type;
 	return v;
+}
 /* Ensure there is no vehicle at the ground at the given position.
  * @param tile Position to examine.
  * @return A vehicle has been found.
  */
 bool EnsureNoVehicleOnGround(TileIndex tile)
+{
 	byte z = GetTileMaxZ(tile);
 	return !HasVehicleOnPos(tile, &z, &EnsureNoVehicleProcZ);
+}
 /** Procedure called for every vehicle found in tunnel/bridge in the hash map */
 static Vehicle *GetVehicleTunnelBridgeProc(Vehicle *v, void *data)
+{
 	if (v->type != VEH_TRAIN && v->type != VEH_ROAD && v->type != VEH_SHIP) return NULL;
 	if (v == (const Vehicle *)data) return NULL;
 	_error_message = STR_ERROR_TRAIN_IN_THE_WAY + v->type;
 	return v;
+}
 /**
  * Finds vehicle in tunnel / bridge
  * @param tile first end
  * @param endtile second end
  * @param ignore Ignore this vehicle when searching
  * @return true if the bridge has a vehicle
  */
 bool HasVehicleOnTunnelBridge(TileIndex tile, TileIndex endtile, const Vehicle *ignore)
+{
 	return HasVehicleOnPos(tile, (void *)ignore, &GetVehicleTunnelBridgeProc) ||
 			HasVehicleOnPos(endtile, (void *)ignore, &GetVehicleTunnelBridgeProc);
+}
 /**
  * Vehicle constructor.
  * @param type Type of the new vehicle.
  */
 Vehicle::Vehicle(VehicleType type)
+{
@@ @@ -437,12 +388,61 @@ void FindVehicleOnPos(TileIndex tile, vo @@
  */
 bool HasVehicleOnPos(TileIndex tile, void *data, VehicleFromPosProc *proc)
+{
 	return VehicleFromPos(tile, data, proc, true) != NULL;
+}
 /** Callback that returns 'real' vehicles lower or at height \c *(byte*)data .
  * @param v Vehicle to examine.
  * @param data Pointer to height data.
  * @return \a v if conditions are met, else \c NULL.
  */
 static Vehicle *EnsureNoVehicleProcZ(Vehicle *v, void *data)
+{
 	byte z = *(byte*)data;
 	if (v->type == VEH_DISASTER || (v->type == VEH_AIRCRAFT && v->subtype == AIR_SHADOW)) return NULL;
 	if (v->z_pos > z) return NULL;
 	_error_message = STR_ERROR_TRAIN_IN_THE_WAY + v->type;
 	return v;
+}
 /* Ensure there is no vehicle at the ground at the given position.
  * @param tile Position to examine.
  * @return A vehicle has been found.
  */
 bool EnsureNoVehicleOnGround(TileIndex tile)
+{
 	byte z = GetTileMaxZ(tile);
 	return !HasVehicleOnPos(tile, &z, &EnsureNoVehicleProcZ);
+}
 /** Procedure called for every vehicle found in tunnel/bridge in the hash map */
 static Vehicle *GetVehicleTunnelBridgeProc(Vehicle *v, void *data)
+{
 	if (v->type != VEH_TRAIN && v->type != VEH_ROAD && v->type != VEH_SHIP) return NULL;
 	if (v == (const Vehicle *)data) return NULL;
 	_error_message = STR_ERROR_TRAIN_IN_THE_WAY + v->type;
 	return v;
+}
 /**
  * Finds vehicle in tunnel / bridge
  * @param tile first end
  * @param endtile second end
  * @param ignore Ignore this vehicle when searching
  * @return true if the bridge has a vehicle
  */
 bool HasVehicleOnTunnelBridge(TileIndex tile, TileIndex endtile, const Vehicle *ignore)
+{
 	return HasVehicleOnPos(tile, (void *)ignore, &GetVehicleTunnelBridgeProc) ||
 			HasVehicleOnPos(endtile, (void *)ignore, &GetVehicleTunnelBridgeProc);
+}
 static void UpdateNewVehiclePosHash(Vehicle *v, bool remove)
+{
 	Vehicle **old_hash = v->old_new_hash;
 	Vehicle **new_hash;

0 comments (0 inline, 0 general)