cpp/openttd-patchpack/source Changeset - r5990:d6898a57a2b5

Changeset - r5990:d6898a57a2b5

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 18 years ago 2007-02-13 00:25:42
rubidium@openttd.org

(svn r8694) -Codechange: make RoadStop's status accessible via accessor functions.

4 files changed with 77 insertions and 28 deletions:

src/roadveh_cmd.cpp

src/station.cpp

src/station.h

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/roadveh_cmd.cpp

➞

Show inline comments

@@ @@ -487,17 +487,17 @@ static void UpdateRoadVehDeltaXY(Vehicle @@
+}
 static void ClearCrashedStation(Vehicle *v)
+{
 	RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile));
 	// mark station as not busy
 	CLRBIT(rs->status, 7);
 	/* Mark the station entrance as not busy */
 	rs->SetEntranceBusy(false);
 	// free parking bay
 	SETBIT(rs->status, HASBIT(v->u.road.state, 1) ? 1 : 0);
 	/* Free the parking bay */
 	rs->FreeBay(HASBIT(v->u.road.state, 1) ? 1 : 0);
+}
 static void RoadVehDelete(Vehicle *v)
+{
 	DeleteWindowById(WC_VEHICLE_VIEW, v->index);
@@ @@ -1077,13 +1077,13 @@ static int RoadFindPathToDest(Vehicle* v @@
 			if (GetRoadStopType(tile) != rstype) {
 				// wrong station type
 				bitmask = 0;
 			} else {
 				// proper station type, check if there is free loading bay
 				if (!_patches.roadveh_queue &&
-						GB(GetRoadStopByTile(tile, rstype)->status, 0, 2) == 0) {
+						!GetRoadStopByTile(tile, rstype)->HasFreeBay()) {
 					// station is full and RV queuing is off
 					bitmask = 0;
+				}
+			}
+		}
+	}
@@ @@ -1408,14 +1408,14 @@ again: @@
+			}
 			if (IsRoadStop(v->tile)) {
 				/* The tile that the vehicle is leaving is a road stop */
 				RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile));
 				/* Vehicle is leaving a road stop tile, mark bay as free and clear the usage bit */
 				SETBIT(rs->status, v->u.road.state & 2 ? 1 : 0); // set bay as free
 				CLRBIT(rs->status, 7); // usage bit
 				rs->FreeBay(HASBIT(v->u.road.state, 1) ? 1 : 0);
 				rs->SetEntranceBusy(false);
+			}
+		}
 		if (!(r & 4)) {
 			/* Set vehicle to first frame on new tile */
 			v->tile = tile;
@@ @@ -1524,13 +1524,13 @@ again: @@
 		if (v->current_order.type != OT_LEAVESTATION &&
 				v->current_order.type != OT_GOTO_DEPOT) {
 			/* Vehicle has arrived at a bay in a road stop */
 			Order old_order;
 			/* Clear road stop busy bit to allow another vehicle to enter or leave */
-			CLRBIT(rs->status, 7);
+			rs->SetEntranceBusy(false);
 			v->last_station_visited = GetStationIndex(v->tile);
 			RoadVehArrivesAt(v, st);
 			old_order = v->current_order;
@@ @@ -1551,23 +1551,23 @@ again: @@
 			InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
 			return;
+		}
 		/* Vehicle is ready to leave a bay in a road stop */
 		if (v->current_order.type != OT_GOTO_DEPOT) {
 			if (HASBIT(rs->status, 7)) {
 				/* Road stop is busy, so wait */
 			if (rs->IsEntranceBusy()) {
 				/* Road stop entrance is busy, so wait */
 				v->cur_speed = 0;
 				return;
+			}
 			v->current_order.type = OT_NOTHING;
 			v->current_order.flags = 0;
 			ClearSlot(v);
+		}
 		/* Set road stop busy bit to prevent another vehicle trying to enter or leave */
-		SETBIT(rs->status, 7);
+		rs->SetEntranceBusy(true);
 		if (rs == v->u.road.slot) {
 			/* We are leaving the correct station */
 			ClearSlot(v);
 		} else if (v->u.road.slot != NULL) {
 			/* We are leaving the wrong station */

src/station.cpp

➞

Show inline comments

@@ @@ -434,6 +434,55 @@ RoadStop *RoadStop::AllocateRaw( void ) @@
 /** Determines whether a RoadStop is a valid (i.e. existing) one */
 bool RoadStop::IsValid() const
+{
 	return xy != INVALID_TILE;
+}
 /** Checks whether there is a free bay in this road stop */
 bool RoadStop::HasFreeBay() const
+{
 	return GB(status, 0, MAX_BAY_COUNT) != 0;
+}
 /**
  * Allocates a bay
  * @return the allocated bay number
  * @pre this->HasFreeBay()
  */
 uint RoadStop::AllocateBay()
+{
 	/* Find the first free bay. If the bit is set, the bay is free. */
 	for (uint bay_nr = 0; bay_nr < MAX_BAY_COUNT; bay_nr++) {
 		if (HASBIT(status, bay_nr)) {
 			CLRBIT(status, bay_nr);
 			return bay_nr;
+		}
+	}
 	/* There has to be a free bay (precondition) */
 	NOT_REACHED();
 	return 0;
+}
 /**
  * Frees the given bay
  * @param nr the number of the bay to free
  */
 void RoadStop::FreeBay(uint nr)
+{
 	assert(nr < MAX_BAY_COUNT);
 	SETBIT(status, nr);
+}
 /** Checks whether the entrance of the road stop is occupied by a vehicle */
 bool RoadStop::IsEntranceBusy() const
+{
 	return HASBIT(status, 7);
+}
 /** Makes an entrance occupied or free */
 void RoadStop::SetEntranceBusy(bool busy)
+{
 	SB(status, 7, 1, !!busy);
+}

src/station.h

➞

Show inline comments

@@ @@ -41,16 +41,17 @@ struct RoadStop { @@
 		BUS,                                ///< A standard stop for buses
 		TRUCK                               ///< A standard stop for trucks
 	};
 	static const int  cDebugCtorLevel =  3;  ///< Debug level on which Contructor / Destructor messages are printed
 	static const uint LIMIT           = 16;  ///< The maximum amount of roadstops that are allowed at a single station
 	static const uint MAX_BAY_COUNT   =  2;  ///< The maximum number of loading bays
 	TileIndex        xy;                    ///< Position on the map
 	RoadStopID       index;                 ///< Global (i.e. pool-wide) index
-	byte             status;                ///< Current status of the Stop. Like which spot is taken. TODO - enumify this
+	byte             status;                ///< Current status of the Stop. Like which spot is taken. Access using *Bay and *Busy functions.
 	byte             num_vehicles;          ///< Number of vehicles currently slotted to this stop
 	struct RoadStop  *next;                 ///< Next stop of the given type at this station
 	RoadStop(TileIndex tile);
 	~RoadStop();
@@ @@ -59,12 +60,19 @@ struct RoadStop { @@
 	/* For loading games */
 	void *operator new (size_t size, int index);
 	void operator delete(void *rs, int index);
 	bool IsValid() const;
 	/* For accessing status */
 	bool HasFreeBay() const;
 	uint AllocateBay();
 	void FreeBay(uint nr);
 	bool IsEntranceBusy() const;
 	void SetEntranceBusy(bool busy);
 protected:
 	static RoadStop *AllocateRaw(void);
 };
 typedef struct StationSpecList {
 	const StationSpec *spec;

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -2275,31 +2275,23 @@ static uint32 VehicleEnter_Station(Vehic @@
 	} else if (v->type == VEH_Road) {
 		if (v->u.road.state < 16 && !HASBIT(v->u.road.state, 2) && v->u.road.frame == 0) {
 			if (IsRoadStop(tile)) {
 				/* Attempt to allocate a parking bay in a road stop */
 				RoadStop *rs = GetRoadStopByTile(tile, GetRoadStopType(tile));
 				/* rs->status bits 0 and 1 describe current the two parking spots.
 				 * 0 means occupied, 1 means free. */
 				// Check if station is busy or if there are no free bays.
 				if (HASBIT(rs->status, 7) || GB(rs->status, 0, 2) == 0)
 					return 8;
 				/* Check if station is busy or if there are no free bays. */
 				if (rs->IsEntranceBusy() || !rs->HasFreeBay()) return 8;
 				v->u.road.state += 32;
 				// if the first bay is free, allocate that, else the second bay must be free.
 				if (HASBIT(rs->status, 0)) {
 					CLRBIT(rs->status, 0);
 				} else {
 					CLRBIT(rs->status, 1);
 					v->u.road.state += 2;
+				}
 				// mark the station as busy
 				SETBIT(rs->status, 7);
 				/* Allocate a bay and update the road state */
 				uint bay_nr = rs->AllocateBay();
 				SB(v->u.road.state, 1, 1, bay_nr);
 				/* Mark the station entrace as busy */
 				rs->SetEntranceBusy(true);
+			}
+		}
+	}
 	return 0;
+}

0 comments (0 inline, 0 general)