TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fold Seismic_sound_playing into Next_seismic_sound_time

Browse source 
When Next_seismic_sound_time is non-zero, a seismic sound is playing.
When Next_seismic_sound_time is zero, no sound is playing.  Use this to
eliminate the explicit tracking variable Seismic_sound_playing.
This commit is contained in:
Kp 2019-08-06 02:59:41 +00:00
parent 8fd231e501
commit 596a17db69
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
similar/main/weapon.cpp
View file

@ -1054,15 +1054,13 @@ void init_smega_detonates()
fix Seismic_tremor_magnitude; fix Seismic_tremor_magnitude;
static fix64 Next_seismic_sound_time; static fix64 Next_seismic_sound_time;
static bool Seismic_sound_playing;
constexpr std::integral_constant<int, SOUND_SEISMIC_DISTURBANCE_START> Seismic_sound{}; constexpr std::integral_constant<int, SOUND_SEISMIC_DISTURBANCE_START> Seismic_sound{};
static void start_seismic_sound() static void start_seismic_sound()
{ {
if (Seismic_sound_playing) if (Next_seismic_sound_time)
return; return;
Seismic_sound_playing = true;
Next_seismic_sound_time = GameTime64 + d_rand()/2; Next_seismic_sound_time = GameTime64 + d_rand()/2;
digi_play_sample_looping(Seismic_sound, F1_0, -1, -1); digi_play_sample_looping(Seismic_sound, F1_0, -1, -1);
} }
@ -1596,7 +1594,7 @@ void do_seismic_stuff(void)
if (Seismic_tremor_volume == 0) if (Seismic_tremor_volume == 0)
{ {
digi_stop_looping_sound(); digi_stop_looping_sound();
Seismic_sound_playing = false; Next_seismic_sound_time = 0;
} }
else if (GameTime64 > Next_seismic_sound_time) else if (GameTime64 > Next_seismic_sound_time)
{ {