Mercurial > hg > openttd

changeset 5837:e18480817d2c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8403) -Fix (r8402): Forgot to remove an enum
author celestar <celestar@openttd.org>
date Thu, 25 Jan 2007 11:11:43 +0000
parents 0b68d5a508a2
children fdc935d875bb
files src/station.h src/station_cmd.cpp
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/station.h
+++ b/src/station.h
@@ -35,10 +35,6 @@
 	int32 feeder_profit;
 } GoodsEntry;
 
-enum {
-	ROAD_STOP_LIMIT = 16,
-};
-
 /** A Stop for a Road Vehicle */
 struct RoadStop {
 	/** Types of RoadStops */
@@ -47,8 +43,8 @@
 		TRUCK                               ///< A standard stop for trucks
 	};
 
-	static const int cDebugCtorLevel =  3;  ///< Debug level on which Contructor / Destructor messages are printed
-	static const int LIMIT           = 16;  ///< The maximum amount of roadstops that are allowed at a single station
+	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
 
 	TileIndex        xy;                    ///< Position on the map
 	RoadStopID       index;                 ///< Global (i.e. pool-wide) index
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -1369,7 +1369,7 @@
 	std::auto_ptr<RoadStop> rs_auto_delete(road_stop);
 
 	if (st != NULL &&
-			GetNumRoadStopsInStation(st, RoadStop::BUS) + GetNumRoadStopsInStation(st, RoadStop::TRUCK) >= ROAD_STOP_LIMIT) {
+			GetNumRoadStopsInStation(st, RoadStop::BUS) + GetNumRoadStopsInStation(st, RoadStop::TRUCK) >= RoadStop::LIMIT) {
 		return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS);
 	}