diff options
| author | celestar <celestar@openttd.org> | 2007-01-25 11:11:43 +0000 |
|---|---|---|
| committer | celestar <celestar@openttd.org> | 2007-01-25 11:11:43 +0000 |
| commit | 2745180a5080771b594ff645d0f19a37ecf7249d (patch) | |
| tree | 7747dae91f3f77fc859dfca9e833dfc757fe73cd | |
| parent | dfb5556376c474ab7ee4e6f5867394e59aaccc76 (diff) | |
| download | openttd-2745180a5080771b594ff645d0f19a37ecf7249d.tar.xz | |
(svn r8403) -Fix (r8402): Forgot to remove an enum
| -rw-r--r-- | src/station.h | 8 | ||||
| -rw-r--r-- | src/station_cmd.cpp | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/station.h b/src/station.h index 178ac665e..547586487 100644 --- a/src/station.h +++ b/src/station.h @@ -35,10 +35,6 @@ typedef struct GoodsEntry { int32 feeder_profit; } GoodsEntry; -enum { - ROAD_STOP_LIMIT = 16, -}; - /** A Stop for a Road Vehicle */ struct RoadStop { /** Types of RoadStops */ @@ -47,8 +43,8 @@ struct RoadStop { 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 diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 49af7243a..22f6b5c81 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1369,7 +1369,7 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) 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); } |