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

Check vehicle sound setting before motion/tick counts in CallVehicleTicks

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-01-19 19:07:15 +00:00
parent 3cb5bfe1a9
commit f4180e8714
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vehicle.cpp
View File

@@ -1214,14 +1214,16 @@ void CallVehicleTicks()
} }
v->motion_counter += front->cur_speed; v->motion_counter += front->cur_speed;
/* Play a running sound if the motion counter passes 256 (Do we not skip sounds?) */ if (_settings_client.sound.vehicle) {
if (GB(v->motion_counter, 0, 8) < front->cur_speed) PlayVehicleSound(v, VSE_RUNNING); /* Play a running sound if the motion counter passes 256 (Do we not skip sounds?) */
if (GB(v->motion_counter, 0, 8) < front->cur_speed) PlayVehicleSound(v, VSE_RUNNING);
/* Play an alternating running sound every 16 ticks */ /* Play an alternating running sound every 16 ticks */
if (GB(v->tick_counter, 0, 4) == 0) { if (GB(v->tick_counter, 0, 4) == 0) {
/* Play running sound when speed > 0 and not braking */ /* Play running sound when speed > 0 and not braking */
bool running = (front->cur_speed > 0) && !(front->vehstatus & (VS_STOPPED | VS_TRAIN_SLOWING)); bool running = (front->cur_speed > 0) && !(front->vehstatus & (VS_STOPPED | VS_TRAIN_SLOWING));
PlayVehicleSound(v, running ? VSE_RUNNING_16 : VSE_STOPPED_16); PlayVehicleSound(v, running ? VSE_RUNNING_16 : VSE_STOPPED_16);
}
} }
break; break;