X-Git-Url: http://deadsoftware.ru/gitweb?p=flatwaifu.git;a=blobdiff_plain;f=src%2Fsmoke.c;h=15961599ebbe65185f948a3b331efa06fdbc97e3;hp=2be63ad59fe73929b9eaeaaf3d865203aa68c459;hb=534310c1f131bb9a53be865c32d90342ed026734;hpb=1907773f7b61fb7e58c585a183180b44d213a286

diff --git a/src/smoke.c b/src/smoke.c
index 2be63ad..1596159 100644
--- a/src/smoke.c
+++ b/src/smoke.c
@@ -31,22 +31,11 @@
 
 #define MAXSR 20
 
-#define SMSN 10
-#define FLSN 8
-
-#pragma pack(1)
-typedef struct{
-  int x,y,xv,yv;
-  byte t,s;
-  short o;
-}smoke_t;
-#pragma pack()
-
-static smoke_t sm[MAXSMOK];
+smoke_t sm[MAXSMOK];
+
 static int sr_r,sxr[MAXSR],syr[MAXSR];
 static int lsm;
 
-static void *spr[SMSN],*fspr[FLSN];
 static void *burnsnd;
 static int burntm=0;
 
@@ -99,10 +88,7 @@ void SMK_init(void) {
 
 void SMK_alloc(void) {
   int i;
-
   burnsnd=Z_getsnd("BURN");
-  for(i=0;i<SMSN;++i) spr[i]=Z_getspr("SMOK",i,0,NULL);
-  for(i=0;i<FLSN;++i) fspr[i]=Z_getspr("FLAM",i,0,NULL);
   for(i=0;i<MAXSR;++i) {
     sxr[i]=myrand(256*2+1)-256;
     syr[i]=myrand(256*2+1)-256;
@@ -158,21 +144,6 @@ void SMK_act(void) {
   }
 }
 
-void SMK_draw(void) {
-  int i,s;
-
-  for(i=0;i<MAXSMOK;++i) if(sm[i].t) switch(sm[i].s) {
-    case 0:
-      if((s=sm[i].t)>=(SMSN-1)*3) s=0; else s=SMSN-1-s/3;
-      V_sprf((sm[i].x>>8)-w_x+WD/2,(sm[i].y>>8)-w_y+HT/2+1+w_o,spr[s],&smoke_sprf);//V_sprf((sm[i].x>>8)-w_x+100,(sm[i].y>>8)-w_y+50+w_o,spr[s],&smoke_sprf);
-      break;
-    case 1:
-      if((s=sm[i].t)>=(FLSN-1)) s=0; else s=FLSN-1-s;
-      V_sprf((sm[i].x>>8)-w_x+WD/2,(sm[i].y>>8)-w_y+HT/2+1+w_o,fspr[s],&flame_sprf);//V_sprf((sm[i].x>>8)-w_x+100,(sm[i].y>>8)-w_y+50+w_o,fspr[s],&flame_sprf);
-      break;
-  }
-}
-
 void SMK_add(int x,int y,int xv,int yv,byte t,byte s,short o) {
   int i;