Changeset - r10895:dba264664a93
[Not reviewed]
master
0 1 0
smatz - 16 years ago 2009-01-23 15:53:24
smatz@openttd.org
(svn r15230) -Fix (r1): aircraft could have zero speed while in air after loading old savegame
1 file changed with 3 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/saveload/vehicle_sl.cpp
Show inline comments
 
@@ -170,8 +170,8 @@ void UpdateOldAircraft()
 

	
 
	Vehicle *v_oldstyle;
 
	FOR_ALL_VEHICLES(v_oldstyle) {
 
	/* airplane has another vehicle with subtype 4 (shadow), helicopter also has 3 (rotor)
 
	 * skip those */
 
		/* airplane has another vehicle with subtype 4 (shadow), helicopter also has 3 (rotor)
 
		 * skip those */
 
		if (v_oldstyle->type == VEH_AIRCRAFT && IsNormalAircraft(v_oldstyle)) {
 
			/* airplane in terminal stopped doesn't hurt anyone, so goto next */
 
			if (v_oldstyle->vehstatus & VS_STOPPED && v_oldstyle->u.air.state == 0) {
 
@@ -181,6 +181,7 @@ void UpdateOldAircraft()
 

	
 
			AircraftLeaveHangar(v_oldstyle); // make airplane visible if it was in a depot for example
 
			v_oldstyle->vehstatus &= ~VS_STOPPED; // make airplane moving
 
			v_oldstyle->cur_speed = v_oldstyle->max_speed; // so aircraft don't have zero speed while in air
 
			if (!v_oldstyle->current_order.IsType(OT_GOTO_STATION) && !v_oldstyle->current_order.IsType(OT_GOTO_DEPOT)) {
 
				/* reset current order so aircraft doesn't have invalid "station-only" order */
 
				v_oldstyle->current_order.MakeDummy();
0 comments (0 inline, 0 general)