From df7327b4536224a78efab4586ec152ec36bdd982 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Wed, 13 Feb 2008 09:34:56 +0000 Subject: [PATCH] (svn r12128) -Codechange: Replace last use of TrainPlayLeaveStationSound(v) with v->PlayLeaveStationSound(), and remove wrapper function. --- src/train_cmd.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index db7a4fe9df..1104275472 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2202,7 +2202,7 @@ static void HandleLocomotiveSmokeCloud(const Vehicle* v) if (sound) PlayVehicleSound(u, VSE_TRAIN_EFFECT); } -static void TrainPlayLeaveStationSound(const Vehicle* v) +void Train::PlayLeaveStationSound() const { static const SoundFx sfx[] = { SND_04_TRAIN, @@ -2212,15 +2212,10 @@ static void TrainPlayLeaveStationSound(const Vehicle* v) SND_41_MAGLEV }; - if (PlayVehicleSound(v, VSE_START)) return; + if (PlayVehicleSound(this, VSE_START)) return; - EngineID engtype = v->engine_type; - SndPlayVehicleFx(sfx[RailVehInfo(engtype)->engclass], v); -} - -void Train::PlayLeaveStationSound() const -{ - TrainPlayLeaveStationSound(this); + EngineID engtype = this->engine_type; + SndPlayVehicleFx(sfx[RailVehInfo(engtype)->engclass], this); } static bool CheckTrainStayInDepot(Vehicle *v) @@ -2253,7 +2248,7 @@ static bool CheckTrainStayInDepot(Vehicle *v) VehicleServiceInDepot(v); InvalidateWindowClasses(WC_TRAINS_LIST); - TrainPlayLeaveStationSound(v); + v->PlayLeaveStationSound(); v->u.rail.track = TRACK_BIT_X; if (v->direction & 2) v->u.rail.track = TRACK_BIT_Y;