mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25840) -Codechange: Use NUM_AIRPORTS_PER_GRF instead of NUM_AIRPORTS to properly distinguish limits per NewGRF and limits of the pool.

release/1.4
frosch 2013-10-12 16:34:23 +00:00
parent cfaa9457a6
commit a92b698525
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/airport.h
View File

@ -37,7 +37,8 @@ enum AirportTypes {
AT_HELISTATION = 8, ///< Heli station airport. AT_HELISTATION = 8, ///< Heli station airport.
AT_OILRIG = 9, ///< Oilrig airport. AT_OILRIG = 9, ///< Oilrig airport.
NEW_AIRPORT_OFFSET = 10, ///< Number of the first newgrf 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_INVALID = 254, ///< Invalid airport.
AT_DUMMY = 255, ///< Dummy airport. AT_DUMMY = 255, ///< Dummy airport.
}; };

10
src/newgrf.cpp
View File

@ -3554,14 +3554,14 @@ static ChangeInfoResult AirportChangeInfo(uint airport, int numinfo, int prop, B
{ {
ChangeInfoResult ret = CIR_SUCCESS; ChangeInfoResult ret = CIR_SUCCESS;
if (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); grfmsg(1, "AirportChangeInfo: Too many airports, trying id (%u), max (%u). Ignoring.", airport + numinfo, NUM_AIRPORTS_PER_GRF);
return CIR_INVALID_ID; return CIR_INVALID_ID;
} }
/* Allocate industry specs if they haven't been allocated already. */ /* Allocate industry specs if they haven't been allocated already. */
if (_cur.grffile->airportspec == NULL) { 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++) { for (int i = 0; i < numinfo; i++) {
@ -7805,7 +7805,7 @@ static void ResetCustomAirports()
for (GRFFile **file = _grf_files.Begin(); file != end; file++) { for (GRFFile **file = _grf_files.Begin(); file != end; file++) {
AirportSpec **aslist = (*file)->airportspec; AirportSpec **aslist = (*file)->airportspec;
if (aslist != NULL) { 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]; AirportSpec *as = aslist[i];
if (as != NULL) { if (as != NULL) {
@ -8572,7 +8572,7 @@ static void FinaliseAirportsArray()
for (GRFFile **file = _grf_files.Begin(); file != end; file++) { for (GRFFile **file = _grf_files.Begin(); file != end; file++) {
AirportSpec **&airportspec = (*file)->airportspec; AirportSpec **&airportspec = (*file)->airportspec;
if (airportspec != NULL) { 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) { if (airportspec[i] != NULL && airportspec[i]->enabled) {
_airport_mngr.SetEntitySpec(airportspec[i]); _airport_mngr.SetEntitySpec(airportspec[i]);
} }