mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r22250) -Cleanup (r16378): Engines poolitems do not need a flag for validness anymore. The pool knows that on its own.

This commit is contained in:
frosch 2011-03-13 22:05:29 +00:00
parent cba6eb87c2
commit d12c2dfa24
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine.cpp
View File

@ -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 */

7
src/newgrf.cpp
View File

@ -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;
}