Mercurial > hg > openttd

changeset 17495:8ece8493d08b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22250) -Cleanup (r16378): Engines poolitems do not need a flag for validness anymore. The pool knows that on its own.
author frosch <frosch@openttd.org>
date Sun, 13 Mar 2011 22:05:29 +0000
parents 24022375538e
children 590bd1fe7019
files src/engine.cpp src/newgrf.cpp
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -85,8 +85,6 @@
 
 	/* Check if this base engine is within the original engine data range */
 	if (base >= _engine_counts[type]) {
-		/* Mark engine as valid anyway */
-		this->info.climates = 0x80;
 		/* Set model life to maximum to make wagons available */
 		this->info.base_life = 0xFF;
 		/* Set road vehicle tractive effort to the default value */
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -511,9 +511,6 @@
 
 		case 0x06: // Climates available
 			ei->climates = buf->ReadByte();
-			/* Sometimes a GRF wants hidden vehicles. Setting climates to
-			 * zero may cause the ID to be reallocated. */
-			if (ei->climates == 0) ei->climates = 0x80;
 			break;
 
 		case 0x07: // Loading speed
@@ -7479,7 +7476,7 @@
 		/* Check if this engine's cargo type is valid. If not, set to the first refittable
 		 * cargo type. Finally disable the vehicle, if there is still no cargo. */
 		if (ei->cargo_type == CT_INVALID && ei->refit_mask != 0) ei->cargo_type = (CargoID)FindFirstBit(ei->refit_mask);
-		if (ei->cargo_type == CT_INVALID) ei->climates = 0x80;
+		if (ei->cargo_type == CT_INVALID) ei->climates = 0;
 
 		/* Clear refit_mask for not refittable ships */
 		if (e->type == VEH_SHIP && !e->u.ship.old_refittable) ei->refit_mask = 0;
@@ -8195,7 +8192,7 @@
 		RailType railtype = GetRailTypeByLabel(_gted[e->index].railtypelabel);
 		if (railtype == INVALID_RAILTYPE) {
 			/* Rail type is not available, so disable this engine */
-			e->info.climates = 0x80;
+			e->info.climates = 0;
 		} else {
 			e->u.rail.railtype = railtype;
 		}