diff --git a/src/weapons.h b/src/weapons.h
index 6ef7460da1b5c2d341bd5520770a6c02637b09e0..62b2a345e09a52a900176ee593eda4b94148b8c6 100644 (file)
--- a/src/weapons.h
+++ b/src/weapons.h
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-// Weapons
+#ifndef WEAPONS_H_INLUDED
+#define WEAPONS_H_INLUDED
#define MAXWPN 300
-void WP_init(void);
-void WP_alloc(void);
-void WP_act(void);
-void WP_draw(void);
-void WP_punch(int,int,int,int);
-int WP_chainsaw(int,int,int,int);
-void WP_gun(int,int,int,int,int,int);
-void WP_pistol(int,int,int,int,int);
-void WP_mgun(int,int,int,int,int);
-void WP_rocket(int,int,int,int,int);
-void WP_revf(int,int,int,int,int,int);
-void WP_plasma(int,int,int,int,int);
-void WP_ball1(int,int,int,int,int);
-void WP_ball2(int,int,int,int,int);
-void WP_ball7(int,int,int,int,int);
-void WP_aplasma(int,int,int,int,int);
-void WP_manfire(int,int,int,int,int);
-void WP_bfgshot(int,int,int,int,int);
-void WP_bfghit(int,int,int);
-void WP_shotgun(int,int,int,int,int);
-void WP_dshotgun(int,int,int,int,int);
-void WP_ognemet(int x,int y,int xd,int yd,int xv,int yv,int o);
-
-void WP_grenade(int x, int y, int xd, int yd, int o);
+typedef struct {
+ obj_t o;
+ byte t, s;
+ int own;
+ short target;
+} weapon_t;
+
+extern weapon_t wp[MAXWPN];
+
+void WP_alloc (void);
+void WP_init (void);
+void WP_act (void);
+void WP_gun (int x, int y, int xd, int yd, int o, int v);
+void WP_punch (int x, int y, int d, int own);
+int WP_chainsaw (int x, int y, int d, int own);
+void WP_rocket (int x, int y, int xd, int yd, int o);
+void WP_revf (int x, int y, int xd, int yd, int o, int t);
+void WP_plasma (int x, int y, int xd, int yd, int o);
+void WP_ball1 (int x, int y, int xd, int yd, int o);
+void WP_ball2 (int x, int y, int xd, int yd, int o);
+void WP_ball7 (int x, int y, int xd, int yd, int o);
+void WP_aplasma (int x, int y, int xd, int yd, int o);
+void WP_manfire (int x, int y, int xd, int yd, int o);
+void WP_bfgshot (int x, int y, int xd, int yd, int o);
+void WP_bfghit (int x, int y, int o);
+void WP_pistol (int x,int y,int xd,int yd,int o);
+void WP_mgun (int x, int y, int xd, int yd, int o);
+void WP_shotgun (int x, int y, int xd, int yd, int o);
+void WP_dshotgun (int x, int y, int xd, int yd, int o);
+void WP_ognemet (int x, int y, int xd, int yd, int xv, int yv, int o);
+
+#endif /* WEAPONS_H_INLUDES */