gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25842) -Codechange: Rename MAX_STATIONS to NUM_STATIONS_PER_GRF.

Browse Source
This commit is contained in:
frosch 2013-10-12 16:35:18 +00:00
parent 48d22700ad
commit 1b6ceef086
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf.cpp
View File

@ -280,7 +280,7 @@ public:
typedef void (*SpecialSpriteHandler)(ByteReader *buf); typedef void (*SpecialSpriteHandler)(ByteReader *buf);
static const uint MAX_STATIONS = 256; static const uint NUM_STATIONS_PER_GRF = 255; ///< Number of StationSpecs per NewGRF; limited to 255 to allow extending Action3 with an extended byte later on.
/** Temporary engine data used when loading only */ /** Temporary engine data used when loading only */
struct GRFTempEngineData { struct GRFTempEngineData {
@ -1726,13 +1726,13 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, Byte
{ {
ChangeInfoResult ret = CIR_SUCCESS; ChangeInfoResult ret = CIR_SUCCESS;
if (stid + numinfo > MAX_STATIONS) { if (stid + numinfo > NUM_STATIONS_PER_GRF) {
grfmsg(1, "StationChangeInfo: Station %u is invalid, max %u, ignoring", stid + numinfo, MAX_STATIONS); grfmsg(1, "StationChangeInfo: Station %u is invalid, max %u, ignoring", stid + numinfo, NUM_STATIONS_PER_GRF);
return CIR_INVALID_ID; return CIR_INVALID_ID;
} }
/* Allocate station specs if necessary */ /* Allocate station specs if necessary */
if (_cur.grffile->stations == NULL) _cur.grffile->stations = CallocT<StationSpec*>(MAX_STATIONS); if (_cur.grffile->stations == NULL) _cur.grffile->stations = CallocT<StationSpec*>(NUM_STATIONS_PER_GRF);
for (int i = 0; i < numinfo; i++) { for (int i = 0; i < numinfo; i++) {
StationSpec *statspec = _cur.grffile->stations[stid + i]; StationSpec *statspec = _cur.grffile->stations[stid + i];
@ -7754,7 +7754,7 @@ static void ResetCustomStations()
for (GRFFile **file = _grf_files.Begin(); file != end; file++) { for (GRFFile **file = _grf_files.Begin(); file != end; file++) {
StationSpec **&stations = (*file)->stations; StationSpec **&stations = (*file)->stations;
if (stations == NULL) continue; if (stations == NULL) continue;
for (uint i = 0; i < MAX_STATIONS; i++) { for (uint i = 0; i < NUM_STATIONS_PER_GRF; i++) {
if (stations[i] == NULL) continue; if (stations[i] == NULL) continue;
StationSpec *statspec = stations[i]; StationSpec *statspec = stations[i];