mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r8403) -Fix (r8402): Forgot to remove an enum
This commit is contained in:
parent
b0a0086e7c
commit
113fa175a4
|
@ -35,10 +35,6 @@ typedef struct GoodsEntry {
|
||||||
int32 feeder_profit;
|
int32 feeder_profit;
|
||||||
} GoodsEntry;
|
} GoodsEntry;
|
||||||
|
|
||||||
enum {
|
|
||||||
ROAD_STOP_LIMIT = 16,
|
|
||||||
};
|
|
||||||
|
|
||||||
/** A Stop for a Road Vehicle */
|
/** A Stop for a Road Vehicle */
|
||||||
struct RoadStop {
|
struct RoadStop {
|
||||||
/** Types of RoadStops */
|
/** Types of RoadStops */
|
||||||
|
@ -47,8 +43,8 @@ struct RoadStop {
|
||||||
TRUCK ///< A standard stop for trucks
|
TRUCK ///< A standard stop for trucks
|
||||||
};
|
};
|
||||||
|
|
||||||
static const int cDebugCtorLevel = 3; ///< Debug level on which Contructor / Destructor messages are printed
|
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 uint LIMIT = 16; ///< The maximum amount of roadstops that are allowed at a single station
|
||||||
|
|
||||||
TileIndex xy; ///< Position on the map
|
TileIndex xy; ///< Position on the map
|
||||||
RoadStopID index; ///< Global (i.e. pool-wide) index
|
RoadStopID index; ///< Global (i.e. pool-wide) index
|
||||||
|
|
|
@ -1369,7 +1369,7 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
|
||||||
std::auto_ptr<RoadStop> rs_auto_delete(road_stop);
|
std::auto_ptr<RoadStop> rs_auto_delete(road_stop);
|
||||||
|
|
||||||
if (st != NULL &&
|
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);
|
return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue