cpp/openttd-patchpack/source Changeset - r13867:d2b9ee4191cd

Changeset - r13867:d2b9ee4191cd

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 14 years ago 2009-12-04 21:13:31
rubidium@openttd.org

(svn r18406) -Cleanup: remove some unneeded constants and code

2 files changed with 3 insertions and 22 deletions:

src/roadstop_base.h

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/roadstop_base.h

➞

Show inline comments

@@ @@ -65,11 +65,9 @@ struct RoadStop : RoadStopPool::PoolItem @@
 		void Rebuild(const RoadStop *rs, int side = -1);
 	};
 	static const uint LIMIT           = 16;  ///< The maximum amount of roadstops that are allowed at a single station
 	TileIndex        xy;                    ///< Position on the map
 	byte             status;                ///< Current status of the Stop, @see RoadStopSatusFlag. Access using *Bay and *Busy functions.
 	struct RoadStop  *next;                 ///< Next stop of the given type at this station
 	TileIndex       xy;     ///< Position on the map
 	byte            status; ///< Current status of the Stop, @see RoadStopSatusFlag. Access using *Bay and *Busy functions.
 	struct RoadStop *next;  ///< Next stop of the given type at this station
 	/** Initializes a RoadStop */
 	FORCEINLINE RoadStop(TileIndex tile = INVALID_TILE) :

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -71,18 +71,6 @@ bool IsHangar(TileIndex t) @@
 	return false;
+}
 static uint GetNumRoadStopsInStation(const Station *st, RoadStopType type)
+{
 	uint num = 0;
 	assert(st != NULL);
 	for (const RoadStop *rs = st->GetPrimaryRoadStop(type); rs != NULL; rs = rs->next) {
 		num++;
+	}
 	return num;
+}
 /**
  * Look for a station around the given tile area.
  * @param ta the area to search over
@@ @@ -1589,11 +1577,6 @@ CommandCost CmdBuildRoadStop(TileIndex t @@
 	/* give us a road stop in the list, and check if something went wrong */
 	if (!RoadStop::CanAllocateItem()) return_cmd_error(type ? STR_ERROR_TOO_MANY_TRUCK_STOPS : STR_ERROR_TOO_MANY_BUS_STOPS);
 	if (st != NULL &&
 			GetNumRoadStopsInStation(st, ROADSTOP_BUS) + GetNumRoadStopsInStation(st, ROADSTOP_TRUCK) >= RoadStop::LIMIT) {
 		return_cmd_error(type ? STR_ERROR_TOO_MANY_TRUCK_STOPS : STR_ERROR_TOO_MANY_BUS_STOPS);
+	}
 	if (st != NULL) {
 		if (st->owner != _current_company) {
 			return_cmd_error(STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION);

0 comments (0 inline, 0 general)