Changeset - r9041:64db01056282
[Not reviewed]
master
0 2 0
peter1138 - 16 years ago 2008-04-24 07:44:21
peter1138@openttd.org
(svn r12860) -Fix [FS#1947]: Train depart animation trigger was not called in some cases.
2 files changed with 6 insertions and 3 deletions:
0 comments (0 inline, 0 general)
src/train_cmd.cpp
Show inline comments
 
@@ -2231,8 +2231,6 @@ void Train::PlayLeaveStationSound() cons
 
		SND_41_MAGLEV
 
	};
 

	
 
	if (IsTileType(this->tile, MP_STATION)) StationAnimationTrigger(NULL, this->tile, STAT_ANIM_TRAIN_DEPARTS);
 

	
 
	if (PlayVehicleSound(this, VSE_START)) return;
 

	
 
	EngineID engtype = this->engine_type;
src/vehicle.cpp
Show inline comments
 
@@ -30,6 +30,7 @@
 
#include "newgrf_callbacks.h"
 
#include "newgrf_engine.h"
 
#include "newgrf_sound.h"
 
#include "newgrf_station.h"
 
#include "group.h"
 
#include "order_func.h"
 
#include "strings_func.h"
 
@@ -2562,10 +2563,14 @@ void Vehicle::LeaveStation()
 
	if (current_order.GetNonStopType() != ONSF_STOP_EVERYWHERE) UpdateVehicleTimetable(this, false);
 

	
 
	current_order.MakeLeaveStation();
 
	GetStation(this->last_station_visited)->loading_vehicles.remove(this);
 
	Station *st = GetStation(this->last_station_visited);
 
	st->loading_vehicles.remove(this);
 

	
 
	HideFillingPercent(this->fill_percent_te_id);
 
	this->fill_percent_te_id = INVALID_TE_ID;
 

	
 
	/* Trigger station animation for trains only */
 
	if (this->type == VEH_TRAIN && IsTileType(this->tile, MP_STATION)) StationAnimationTrigger(st, this->tile, STAT_ANIM_TRAIN_DEPARTS);
 
}
 

	
 

	
0 comments (0 inline, 0 general)