dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r13681) -Revert (r13678, r13677): the fixes didn't work in all cases (assertions on savegame loads).

Browse Source 
-Fix [FS#2102]: but now in a hopefully beter way.
This commit is contained in:
rubidium
2008-07-08 15:10:23 +00:00
parent 03d32e12fb
commit d974acac89
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vehicle.cpp
View File

@@ -275,8 +275,17 @@ void AfterLoadVehicles(bool clear_te_id)
}
FOR_ALL_VEHICLES(v) {
assert(v->First() != NULL);
assert(v->first != NULL);
if (v->type == VEH_TRAIN && (IsFrontEngine(v) || IsFreeWagon(v))) {
if (IsFrontEngine(v)) v->u.rail.last_speed = v->cur_speed; // update displayed train speed
TrainConsistChanged(v);
} else if (v->type == VEH_ROAD && IsRoadVehFront(v)) {
RoadVehUpdateCache(v);
}
}
FOR_ALL_VEHICLES(v) {
switch (v->type) {
case VEH_ROAD:
v->u.road.roadtype = HasBit(EngInfo(v->engine_type)->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD;
@@ -312,19 +321,6 @@ void AfterLoadVehicles(bool clear_te_id)
}
}
void InitializeVehicleCaches()
{
Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->type == VEH_TRAIN && (IsFrontEngine(v) || IsFreeWagon(v))) {
if (IsFrontEngine(v)) v->u.rail.last_speed = v->cur_speed; // update displayed train speed
TrainConsistChanged(v);
} else if (v->type == VEH_ROAD && IsRoadVehFront(v)) {
RoadVehUpdateCache(v);
}
}
}
Vehicle::Vehicle()
{
this->type = VEH_INVALID;