diff --git a/common/main/game.h b/common/main/game.h index 524bb2c06..0b2df403e 100644 --- a/common/main/game.h +++ b/common/main/game.h @@ -56,10 +56,8 @@ extern fix64 GameTime64; // time in game (sum of FrameTime) extern int d_tick_count; // increments according to DESIGNATED_GAME_FRAMETIME extern int d_tick_step; // true once in interval of DESIGNATED_GAME_FRAMETIME extern fix64 Next_laser_fire_time; // Time at which player can next fire his selected laser. -extern fix64 Last_laser_fired_time; extern fix64 Next_missile_fire_time; // Time at which player can next fire his selected missile. extern fix64 Next_flare_fire_time; -extern fix Laser_delay_time; // Delay between laser fires. } #if defined(DXX_BUILD_DESCENT_II) diff --git a/similar/main/gameseq.cpp b/similar/main/gameseq.cpp index d23c07e19..a99fb6faa 100644 --- a/similar/main/gameseq.cpp +++ b/similar/main/gameseq.cpp @@ -360,7 +360,7 @@ void init_player_stats_level(const secret_restore secret_flag) Dead_player_camera = NULL; // properly init these cursed globals - Next_flare_fire_time = Last_laser_fired_time = Next_laser_fire_time = Next_missile_fire_time = GameTime64; + Next_flare_fire_time = Next_laser_fire_time = Next_missile_fire_time = GameTime64; #if defined(DXX_BUILD_DESCENT_II) Controls.state.afterburner = 0; Last_afterburner_state = 0; diff --git a/similar/main/laser.cpp b/similar/main/laser.cpp index 5c64f23b4..935ea3f3f 100644 --- a/similar/main/laser.cpp +++ b/similar/main/laser.cpp @@ -1744,8 +1744,6 @@ void Laser_do_weapon_sequence(const vobjptridx_t obj) namespace dcx { -fix64 Last_laser_fired_time = 0; - static inline int sufficient_energy(int energy_used, fix energy) { return !energy_used || (energy >= energy_used); @@ -1809,8 +1807,6 @@ int do_laser_firing_player(void) if (GameTime64 - Next_laser_fire_time <= FrameTime) // if firing is prolonged by FrameTime overhead, let's try to fix that. fire_frame_overhead = GameTime64 - Next_laser_fire_time; - Last_laser_fired_time = GameTime64; - if (!cheats.rapidfire) Next_laser_fire_time = GameTime64 + Weapon_info[weapon_index].fire_wait - fire_frame_overhead; else diff --git a/similar/main/state.cpp b/similar/main/state.cpp index 4b473eba4..2e28e6c64 100644 --- a/similar/main/state.cpp +++ b/similar/main/state.cpp @@ -1632,7 +1632,6 @@ int state_restore_all_sub(const char *filename, const secret_restore secret) Auto_fire_fusion_cannon_time = 0; Next_laser_fire_time = GameTime64; Next_missile_fire_time = GameTime64; - Last_laser_fired_time = GameTime64; state_game_id = 0;