X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Ffx.c;h=35777aca9371d9abf7ba57965722bcc8181e046b;hb=3d2215798aaab87db7ae5265d21e359864e1f1c2;hp=2b81fd652610230a8331ca015dc1e86be90ccc92;hpb=c46b82f5794be555af272740e67ead316b9b1f90;p=flatwaifu.git diff --git a/src/fx.c b/src/fx.c index 2b81fd6..35777ac 100644 --- a/src/fx.c +++ b/src/fx.c @@ -23,7 +23,6 @@ #include #include #include -#include "vga.h" #include "view.h" #include "fx.h" #include "misc.h" @@ -31,16 +30,9 @@ enum{NONE,TFOG,IFOG,BUBL}; -#pragma pack(1) -typedef struct{ - int x,y,xv,yv; - char t,s; -}fx_t; -#pragma pack() +fx_t fx[MAXFX]; -static void *spr[15],*bsnd[2]; -static char sprd[15]; -static fx_t fx[MAXFX]; +static void *bsnd[2]; static char bubsn; static int last; @@ -68,7 +60,7 @@ static void setamp(int a) { } void FX_trans1(int t) { - +/* int x,y,u,v; static unsigned char k; unsigned p; @@ -85,7 +77,7 @@ void FX_trans1(int t) { else scra[p]=fx_scr1[v*320+u]; }else scra[p]=fx_scr2[p]; } - +*/ } static void init_fx1sin(void) { @@ -139,10 +131,6 @@ void FX_loadgame (FILE *h) { } void FX_alloc(void) { - int i; - - for(i=0;i<10;++i) spr[i]=Z_getspr("TFOG",i,0,sprd+i); - for(;i<15;++i) spr[i]=Z_getspr("IFOG",i-10,0,sprd+i); bsnd[0]=Z_getsnd("BUBL1"); bsnd[1]=Z_getsnd("BUBL2"); init_fx1sin(); @@ -178,22 +166,6 @@ void FX_act(void) { } } -void FX_draw(void) { - int i,s; - - for(i=0;i>8)-w_x+WD/2,(fx[i].y>>8)-w_y+HT/2+1+w_o,0xC0+fx[i].s);//V_dot((fx[i].x>>8)-w_x+100,(fx[i].y>>8)-w_y+50+w_o,0xC0+fx[i].s); - continue; - } - if(s>=0) Z_drawspr(fx[i].x,fx[i].y,spr[s],sprd[s]); - } -} - static int findfree(void) { int i;