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

Make weapon.h usable in common source files

Browse source
This commit is contained in:
Kp 2013-07-21 00:03:08 +00:00
parent a1ba420031
commit e41fa25905
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
common/main/weapon.h
View file

@ -147,6 +147,7 @@ typedef struct weapon_info {
#define WEAPON_RENDER_POLYMODEL 2
#define WEAPON_RENDER_VCLIP 3
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
#if defined(DXX_BUILD_DESCENT_I)
#define MAX_WEAPON_TYPES 30
@ -162,6 +163,22 @@ typedef struct weapon_info {
#define MAX_SECONDARY_WEAPONS 10
#endif
extern const ubyte Primary_weapon_to_weapon_info[MAX_PRIMARY_WEAPONS];
extern const ubyte Secondary_weapon_to_weapon_info[MAX_SECONDARY_WEAPONS];
//for each primary weapon, what kind of powerup gives weapon
extern const ubyte Primary_weapon_to_powerup[MAX_PRIMARY_WEAPONS];
//for each Secondary weapon, what kind of powerup gives weapon
extern const ubyte Secondary_weapon_to_powerup[MAX_SECONDARY_WEAPONS];
extern const int Primary_ammo_max[MAX_PRIMARY_WEAPONS];
extern const ubyte Secondary_ammo_max[MAX_SECONDARY_WEAPONS];
/*
* reads n weapon_info structs from a PHYSFS_file
*/
extern weapon_info Weapon_info[MAX_WEAPON_TYPES];
extern int weapon_info_read_n(weapon_info *wi, int n, PHYSFS_file *fp, int file_version);
#endif
//given a weapon index, return the flag value
#define HAS_FLAG(index) (1<<(index))
@ -215,20 +232,11 @@ typedef struct weapon_info {
#define NUM_SMART_CHILDREN 6 // Number of smart children created by default.
#endif
extern weapon_info Weapon_info[];
extern int N_weapon_types;
extern void do_weapon_select(int weapon_num, int secondary_flag);
extern sbyte Primary_weapon, Secondary_weapon;
extern const ubyte Primary_weapon_to_weapon_info[MAX_PRIMARY_WEAPONS];
extern const ubyte Secondary_weapon_to_weapon_info[MAX_SECONDARY_WEAPONS];
//for each primary weapon, what kind of powerup gives weapon
extern const ubyte Primary_weapon_to_powerup[MAX_SECONDARY_WEAPONS];
//for each Secondary weapon, what kind of powerup gives weapon
extern const ubyte Secondary_weapon_to_powerup[MAX_SECONDARY_WEAPONS];
extern void auto_select_weapon(int weapon_type); //parm is primary or secondary
extern void select_weapon(int weapon_num, int secondary_flag, int print_message,int wait_for_rearm);
@ -246,8 +254,6 @@ extern const char *const Primary_weapon_names[];
extern const char *const Secondary_weapon_names[];
extern const sbyte Weapon_is_energy[MAX_WEAPON_TYPES];
#endif
extern const int Primary_ammo_max[MAX_PRIMARY_WEAPONS];
extern const ubyte Secondary_ammo_max[MAX_SECONDARY_WEAPONS];
#define HAS_WEAPON_FLAG 1
#define HAS_ENERGY_FLAG 2
@ -287,11 +293,6 @@ extern void smega_rock_stuff(void);
extern void init_smega_detonates(void);
#endif
/*
* reads n weapon_info structs from a PHYSFS_file
*/
extern int weapon_info_read_n(weapon_info *wi, int n, PHYSFS_file *fp, int file_version);
//return which bomb will be dropped next time the bomb key is pressed
#if defined(DXX_BUILD_DESCENT_I)
static inline int which_bomb(void)