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

Remove write-only Last_laser_fired_time

Browse source
This commit is contained in:
Kp 2015-12-22 04:18:52 +00:00
parent 1975cdb912
commit f4a5040a60
4 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/game.h
View file

@ -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)

2
similar/main/gameseq.cpp
View file

@ -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;

4
similar/main/laser.cpp
View file

@ -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

1
similar/main/state.cpp
View file

@ -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;