cpp/openttd-patchpack/source Changeset - r14725:026b6e13b803

Changeset - r14725:026b6e13b803

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

yexo - 14 years ago 2010-03-05 23:21:23
yexo@openttd.org

(svn r19323) -Codechange: copy the AirportSpec original array to an internal array in AirportSpec

3 files changed with 21 insertions and 3 deletions:

src/newgrf.cpp

src/newgrf_airport.cpp

src/newgrf_airport.h

0 comments (0 inline, 0 general)

src/newgrf.cpp

➞

Show inline comments

@@ @@ -36,6 +36,7 @@ @@
 #include "newgrf_townname.h"
 #include "newgrf_industries.h"
 #include "newgrf_airporttiles.h"
 #include "newgrf_airport.h"
 #include "rev.h"
 #include "fios.h"
 #include "rail.h"
@@ @@ -5907,6 +5908,7 @@ static void ResetNewGRFData() @@
 	/* Reset airport-related structures */
 	ResetCustomAirports();
 	AirportSpec::ResetAirports();
 	AirportTileSpec::ResetAirportTiles();
 	/* Reset canal sprite groups and flags */

src/newgrf_airport.cpp

➞

Show inline comments

@@ @@ -18,6 +18,8 @@ @@
 AirportSpec AirportSpec::dummy = {NULL, NULL, 0, 0, 0, 0, 0, MIN_YEAR, MIN_YEAR, ATP_TTDP_LARGE};
 AirportSpec AirportSpec::oilrig = {NULL, NULL, 0, 1, 1, 0, 4, MIN_YEAR, MIN_YEAR, ATP_TTDP_OILRIG};
 AirportSpec AirportSpec::specs[NUM_AIRPORTS];
 /**
  * Retrieve airport spec for the given airport
  * @param type index of airport
@@ @@ -26,9 +28,8 @@ AirportSpec AirportSpec::oilrig = {NULL, @@
 /* static */ const AirportSpec *AirportSpec::Get(byte type)
+{
 	if (type == AT_OILRIG) return &oilrig;
 	assert(type < NUM_AIRPORTS);
 	extern const AirportSpec _origin_airport_specs[];
 	return &_origin_airport_specs[type];
 	assert(type < lengthof(AirportSpec::specs));
 	return &AirportSpec::specs[type];
+}
 bool AirportSpec::IsAvailable() const
@@ @@ -37,3 +38,13 @@ bool AirportSpec::IsAvailable() const @@
 	if (_settings_game.station.never_expire_airports) return true;
 	return _cur_year <= this->max_year;
+}
 /**
  * This function initialize the airportspec array.
  */
 void AirportSpec::ResetAirports()
+{
 	extern const AirportSpec _origin_airport_specs[];
 	memset(&AirportSpec::specs, 0, sizeof(AirportSpec::specs));
 	memcpy(&AirportSpec::specs, &_origin_airport_specs, sizeof(AirportSpec) * NUM_AIRPORTS);
+}

src/newgrf_airport.h

➞

Show inline comments

@@ @@ -50,8 +50,13 @@ struct AirportSpec { @@
 	bool IsAvailable() const;
 	static void ResetAirports();
 	static AirportSpec dummy;
 	static AirportSpec oilrig;
 private:
 	static AirportSpec specs[NUM_AIRPORTS];
 };

0 comments (0 inline, 0 general)