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

Add stub which_bomb to match D2X code

Browse source
This commit is contained in:
Kp 2013-03-10 03:11:16 +00:00
parent 24cd2f7767
commit b14abd4749
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/gauges.c
View file

@ -987,7 +987,7 @@ void show_bomb_count(int x,int y,int bg_color,int always_show,int right_align)
if (!PlayerCfg.BombGauge)
return;
bomb = PROXIMITY_INDEX;
bomb = which_bomb();
count = Players[Player_num].secondary_ammo[bomb];
count = min(count,99); //only have room for 2 digits - cheating give 200

3
main/laser.c
View file

@ -1383,7 +1383,8 @@ int Missile_gun=0, Proximity_dropped = 0;
//changed on 9/16/98 by adb to distinguish between drop bomb and secondary fire
void do_missile_firing(int drop_bomb)
{
int weapon = (drop_bomb) ? PROXIMITY_INDEX : Secondary_weapon;
int bomb = which_bomb();
int weapon = (drop_bomb) ? bomb : Secondary_weapon;
Network_laser_track = -1;

6
main/weapon.h
View file

@ -179,4 +179,10 @@ extern void maybe_select_secondary(int weapon_index);
*/
extern int weapon_info_read_n(weapon_info *wi, int n, PHYSFS_file *fp);
//return which bomb will be dropped next time the bomb key is pressed
static inline int which_bomb(void)
{
return PROXIMITY_INDEX;
}
#endif