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

Move Smega_detonate_times to d_level_unique_seismic_state::Earthshaker_detonate_times

Browse source
This commit is contained in:
Kp 2019-08-06 02:59:41 +00:00
parent 140711cb35
commit 625d863c55
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/main/game.h
View file

@ -187,6 +187,7 @@ struct d_level_unique_seismic_state
fix64 Seismic_disturbance_end_time; fix64 Seismic_disturbance_end_time;
fix64 Next_seismic_sound_time; fix64 Next_seismic_sound_time;
int Seismic_tremor_volume; int Seismic_tremor_volume;
array<fix64, 4> Earthshaker_detonate_times;
}; };
extern d_level_shared_seismic_state LevelSharedSeismicState; extern d_level_shared_seismic_state LevelSharedSeismicState;

10
similar/main/weapon.cpp
View file

@ -1042,14 +1042,12 @@ void weapons_homing_all_reset()
} }
#define SMEGA_SHAKE_TIME (F1_0*2) #define SMEGA_SHAKE_TIME (F1_0*2)
#define MAX_SMEGA_DETONATES 4
static array<fix64, MAX_SMEGA_DETONATES> Smega_detonate_times;
// Call this to initialize for a new level. // Call this to initialize for a new level.
// Sets all super mega missile detonation times to 0 which means there aren't any. // Sets all super mega missile detonation times to 0 which means there aren't any.
void init_smega_detonates() void init_smega_detonates()
{ {
Smega_detonate_times = {}; LevelUniqueSeismicState.Earthshaker_detonate_times = {};
} }
fix Seismic_tremor_magnitude; fix Seismic_tremor_magnitude;
@ -1071,7 +1069,7 @@ void rock_the_mine_frame(void)
{ {
auto &Objects = LevelUniqueObjectState.Objects; auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr; auto &vmobjptr = Objects.vmptr;
range_for (auto &i, Smega_detonate_times) range_for (auto &i, LevelUniqueSeismicState.Earthshaker_detonate_times)
{ {
if (i != 0) { if (i != 0) {
fix delta_time = GameTime64 - i; fix delta_time = GameTime64 - i;
@ -1191,8 +1189,8 @@ static void seismic_disturbance_frame(void)
// Call this when a smega detonates to start the process of rocking the mine. // Call this when a smega detonates to start the process of rocking the mine.
void smega_rock_stuff(void) void smega_rock_stuff(void)
{ {
fix64 *least = &Smega_detonate_times[0]; auto least = &LevelUniqueSeismicState.Earthshaker_detonate_times[0];
range_for (auto &i, Smega_detonate_times) range_for (auto &i, LevelUniqueSeismicState.Earthshaker_detonate_times)
{ {
if (i + SMEGA_SHAKE_TIME < GameTime64) if (i + SMEGA_SHAKE_TIME < GameTime64)
i = 0; i = 0;