diff --git a/src/weapons.c b/src/weapons.c
index 34b5ed4a1a7f25f49bc3e8467c0a62b8d03c2fcd..b3b757dc11724122aefce6874e89f6074a199b8f 100644 (file)
--- a/src/weapons.c
+++ b/src/weapons.c
#include "smoke.h"
#include "weapons.h"
#include "misc.h"
+#include "files.h"
+#include "game.h"
+#include "player.h"
+#include "monster.h"
+#include "switch.h"
#include "my.h"
-extern int hit_xv,hit_yv;
-
-void bfg_fly(int x,int y,int own);
-
enum{NONE=0,ROCKET,PLASMA,APLASMA,BALL1,BALL2,BALL7,BFGBALL,BFGHIT,
MANF,REVF,FIRE};
weapon_t wp[MAXWPN];
static void *snd[14];
-
static void throw(int,int,int,int,int,int,int,int);
void WP_savegame (FILE *h) {
}
}
-void WP_alloc(void) {
+void WP_alloc (void) {
int i;
static char nm[14][6]={
"PISTOL",
for(i=0;i<14;++i) snd[i]=Z_getsnd(nm[i]);
}
-void WP_init(void) {
+void WP_init (void) {
int i;
for(i=0;i<MAXWPN;++i) wp[i].t=NONE;
}
-void WP_act(void) {
+void WP_act (void) {
int i,st;
static obj_t o;
}
}
-void WP_gun(int x,int y,int xd,int yd,int o,int v) {
+void WP_gun (int x, int y, int xd, int yd, int o, int v) {
register dword d,m;
int sx,sy,lx,ly;
dword xe,ye,s;
}
}
-void WP_punch(int x,int y,int d,int own) {
+void WP_punch (int x, int y, int d, int own) {
obj_t o;
o.x=x;o.y=y;o.r=12;o.h=26;
if(Z_hit(&o,d,own,HIT_SOME)) Z_sound(snd[9],128);
}
-int WP_chainsaw(int x,int y,int d,int own) {
+int WP_chainsaw (int x, int y, int d, int own) {
obj_t o;
o.x=x;o.y=y;o.r=12;o.h=26;
wp[i].o.vx=wp[i].o.vy=0;
}
-void WP_rocket(int x,int y,int xd,int yd,int o) {
+void WP_rocket (int x, int y, int xd, int yd, int o) {
int i;
for(i=0;i<MAXWPN;++i) if(!wp[i].t) {
}
}
-void WP_revf(int x,int y,int xd,int yd,int o,int t) {
+void WP_revf (int x, int y, int xd, int yd, int o, int t) {
int i;
for(i=0;i<MAXWPN;++i) if(!wp[i].t) {
}
}
-void WP_plasma(int x,int y,int xd,int yd,int o) {
+void WP_plasma (int x, int y, int xd, int yd, int o) {
int i;
for(i=0;i<MAXWPN;++i) if(!wp[i].t) {
}
}
-void WP_ball1(int x,int y,int xd,int yd,int o) {
+void WP_ball1 (int x, int y, int xd, int yd, int o) {
int i;
for(i=0;i<MAXWPN;++i) if(!wp[i].t) {
}
}
-void WP_ball2(int x,int y,int xd,int yd,int o) {
+void WP_ball2 (int x, int y, int xd, int yd, int o) {
int i;
for(i=0;i<MAXWPN;++i) if(!wp[i].t) {
}
}
-void WP_ball7(int x,int y,int xd,int yd,int o) {
+void WP_ball7 (int x, int y, int xd, int yd, int o) {
int i;
for(i=0;i<MAXWPN;++i) if(!wp[i].t) {
}
}
-void WP_aplasma(int x,int y,int xd,int yd,int o) {
+void WP_aplasma (int x, int y, int xd, int yd, int o) {
int i;
for(i=0;i<MAXWPN;++i) if(!wp[i].t) {
}
}
-void WP_manfire(int x,int y,int xd,int yd,int o) {
+void WP_manfire (int x, int y, int xd, int yd, int o) {
int i;
for(i=0;i<MAXWPN;++i) if(!wp[i].t) {
}
}
-void WP_bfgshot(int x,int y,int xd,int yd,int o) {
+void WP_bfgshot (int x, int y, int xd, int yd, int o) {
int i;
for(i=0;i<MAXWPN;++i) if(!wp[i].t) {
}
}
-void WP_bfghit(int x,int y,int o) {
+void WP_bfghit (int x, int y, int o) {
int i;
for(i=0;i<MAXWPN;++i) if(!wp[i].t) {
}
}
-void WP_pistol(int x,int y,int xd,int yd,int o) {
+void WP_pistol (int x,int y,int xd,int yd,int o) {
Z_sound(snd[0],96);
WP_gun(x,y,xd,yd,o,1);
if(g_dm) {
}
}
-void WP_mgun(int x,int y,int xd,int yd,int o) {
+void WP_mgun (int x, int y, int xd, int yd, int o) {
Z_sound(snd[11],128);
WP_gun(x,y,xd,yd,o,1);
}
-void WP_shotgun(int x,int y,int xd,int yd,int o) {
+void WP_shotgun (int x, int y, int xd, int yd, int o) {
int i,j;
Z_sound(snd[1],128);
}
}
-void WP_dshotgun(int x,int y,int xd,int yd,int o) {
+void WP_dshotgun (int x, int y, int xd, int yd, int o) {
int i,j;
Z_sound(snd[2],128);
}
}
-void WP_ognemet(int x,int y,int xd,int yd,int xv,int yv,int o) {
+void WP_ognemet (int x, int y, int xd, int yd, int xv, int yv, int o) {
int m;
m=abs(xd-x);if(!m) m=abs(yd-y);