diff options
| author | frosch <frosch@openttd.org> | 2013-10-12 16:34:23 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2013-10-12 16:34:23 +0000 |
| commit | a92b6985258901b0f45a22a9eb6e61b731e638f1 (patch) | |
| tree | c5bb68bb1f4d413a0ae05910bfd64f262dcf0e9c | |
| parent | cfaa9457a6926fb85ae477e29c2df036e2691121 (diff) | |
| download | openttd-a92b6985258901b0f45a22a9eb6e61b731e638f1.tar.xz | |
(svn r25840) -Codechange: Use NUM_AIRPORTS_PER_GRF instead of NUM_AIRPORTS to properly distinguish limits per NewGRF and limits of the pool.
| -rw-r--r-- | src/airport.h | 3 | ||||
| -rw-r--r-- | src/newgrf.cpp | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/airport.h b/src/airport.h index 7f0cac494..34266e36c 100644 --- a/src/airport.h +++ b/src/airport.h @@ -37,7 +37,8 @@ enum AirportTypes { AT_HELISTATION = 8, ///< Heli station airport. AT_OILRIG = 9, ///< Oilrig airport. NEW_AIRPORT_OFFSET = 10, ///< Number of the first newgrf airport. - NUM_AIRPORTS = 128, ///< Maximal number of airports. + NUM_AIRPORTS_PER_GRF = 128, ///< Maximal number of airports per NewGRF. + NUM_AIRPORTS = 128, ///< Maximal number of airports in total. AT_INVALID = 254, ///< Invalid airport. AT_DUMMY = 255, ///< Dummy airport. }; diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 8274dd8b9..d4851f88f 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -3554,14 +3554,14 @@ static ChangeInfoResult AirportChangeInfo(uint airport, int numinfo, int prop, B { ChangeInfoResult ret = CIR_SUCCESS; - if (airport + numinfo > NUM_AIRPORTS) { - grfmsg(1, "AirportChangeInfo: Too many airports, trying id (%u), max (%u). Ignoring.", airport + numinfo, NUM_AIRPORTS); + if (airport + numinfo > NUM_AIRPORTS_PER_GRF) { + grfmsg(1, "AirportChangeInfo: Too many airports, trying id (%u), max (%u). Ignoring.", airport + numinfo, NUM_AIRPORTS_PER_GRF); return CIR_INVALID_ID; } /* Allocate industry specs if they haven't been allocated already. */ if (_cur.grffile->airportspec == NULL) { - _cur.grffile->airportspec = CallocT<AirportSpec*>(NUM_AIRPORTS); + _cur.grffile->airportspec = CallocT<AirportSpec*>(NUM_AIRPORTS_PER_GRF); } for (int i = 0; i < numinfo; i++) { @@ -7805,7 +7805,7 @@ static void ResetCustomAirports() for (GRFFile **file = _grf_files.Begin(); file != end; file++) { AirportSpec **aslist = (*file)->airportspec; if (aslist != NULL) { - for (uint i = 0; i < NUM_AIRPORTS; i++) { + for (uint i = 0; i < NUM_AIRPORTS_PER_GRF; i++) { AirportSpec *as = aslist[i]; if (as != NULL) { @@ -8572,7 +8572,7 @@ static void FinaliseAirportsArray() for (GRFFile **file = _grf_files.Begin(); file != end; file++) { AirportSpec **&airportspec = (*file)->airportspec; if (airportspec != NULL) { - for (int i = 0; i < NUM_AIRPORTS; i++) { + for (int i = 0; i < NUM_AIRPORTS_PER_GRF; i++) { if (airportspec[i] != NULL && airportspec[i]->enabled) { _airport_mngr.SetEntitySpec(airportspec[i]); } |