cpp/openttd-patchpack/source Changeset - r14255:6e7e24be6c46

Changeset - r14255:6e7e24be6c46

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

yexo - 14 years ago 2010-01-15 21:00:46
yexo@openttd.org

(svn r18816) -Fix (r18807): getting the catchment area of oilrigs triggered an assert

2 files changed with 3 insertions and 0 deletions:

src/airport.cpp

src/airport.h

0 comments (0 inline, 0 general)

src/airport.cpp

➞

Show inline comments

@@ @@ -122,12 +122,13 @@ enum AirportTiles { @@
 	/* 141-143 used for flag animation */
 };
 #include "table/airport_defaults.h"
 AirportSpec AirportSpec::dummy = {NULL, NULL, 0, 0, 0, 0, 0, MIN_YEAR, MIN_YEAR};
 AirportSpec AirportSpec::oilrig = {NULL, NULL, 0, 1, 1, 0, 4, MIN_YEAR, MIN_YEAR};
 /* Uncomment this to print out a full report of the airport-structure
  * You should either use
  * - true: full-report, print out every state and choice with string-names
  * OR
  * - false: give a summarized report which only shows current and next position */

src/airport.h

➞

Show inline comments

@@ @@ -60,20 +60,22 @@ struct AirportSpec { @@
 	byte catchment;                        ///< catchment area of this airport
 	Year min_year;                         ///< first year the airport is available
 	Year max_year;                         ///< last year the airport is available
 	static AirportSpec *Get(byte type)
+	{
 		if (type == AT_OILRIG) return &oilrig;
 		assert(type < NUM_AIRPORTS);
 		extern AirportSpec _origin_airport_specs[NUM_AIRPORTS];
 		return &_origin_airport_specs[type];
+	}
 	bool IsAvailable() const;
 	static AirportSpec dummy;
 	static AirportSpec oilrig;
 };
 enum {
 	AMED_NOSPDCLAMP = 1 << 0,
 	AMED_TAKEOFF    = 1 << 1,

0 comments (0 inline, 0 general)