summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2011-03-13 22:05:29 +0000
committerfrosch <frosch@openttd.org>2011-03-13 22:05:29 +0000
commitd12c2dfa24e8cd71058a6099ede2d98f866fd408 (patch)
tree50116f53c0b6e3e9c96edeb6cce7cf6d1531701f /src
parentcba6eb87c2493e9d86d37db865bb85817d451c80 (diff)
downloadopenttd-d12c2dfa24e8cd71058a6099ede2d98f866fd408.tar.xz
(svn r22250) -Cleanup (r16378): Engines poolitems do not need a flag for validness anymore. The pool knows that on its own.
Diffstat (limited to 'src')
-rw-r--r--src/engine.cpp2
-rw-r--r--src/newgrf.cpp7
2 files changed, 2 insertions, 7 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index fa51e7c59..f55b46c0f 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -85,8 +85,6 @@ Engine::Engine(VehicleType type, EngineID base)
/* 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 */
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 31bcb2733..c96ff3347 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -511,9 +511,6 @@ static ChangeInfoResult CommonVehicleChangeInfo(EngineInfo *ei, int prop, ByteRe
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 @@ static void CalculateRefitMasks()
/* 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 @@ static void AfterLoadGRFs()
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;
}