X-Git-Url: https://deadsoftware.ru/gitweb?p=flatwaifu.git;a=blobdiff_plain;f=src%2Fitems.c;h=65f39e2bb5f5437a02ff017ead6f102bc9003776;hp=126fd5ce4e24e5f80fbc1e39895917cb3dc8fb75;hb=563dffaf02ff36da4054f937fcc9f99a072e15bf;hpb=e5c2eddc151a59db4e611a77901732d7c15fde90

diff --git a/src/items.c b/src/items.c
index 126fd5c..65f39e2 100644
--- a/src/items.c
+++ b/src/items.c
@@ -31,150 +31,147 @@
 #include "things.h"
 #include "misc.h"
 #include "map.h"
+#include "my.h"
+#include "files.h"
+#include "game.h"
+item_t it[MAXITEM];
 
-extern map_block_t blk;
+static void *snd[4];
+static int tsndtm, rsndtm;
 
-#pragma pack(1)
-typedef struct{
-  obj_t o;
-  int t;
-  int s;
-}item_t;
-#pragma pack()
+int itm_rtime = 1092;
 
-static void *snd[4],*spr[58];
-static char sprd[58];
-static int tsndtm,rsndtm;
-static item_t it[MAXITEM];
-
-int itm_rtime=1092;
-
-void IT_savegame(FILE* h) {
-  int n;
-
-  for(n=MAXITEM;--n;) if(it[n].t) break;
-  ++n;myfwrite(&n,1,4,h);
-  myfwrite(it,1,n*sizeof(it[0]),h);
-  myfwrite(&itm_rtime,1,4,h);
-}
-
-void IT_loadgame(FILE* h) {
-  int n;
-
-  myfread(&n,1,4,h);
-  myfread(it,1,n*sizeof(it[0]),h);
-  myfread(&itm_rtime,1,4,h);
-}
-
-void IT_alloc(void) {
-  int i,j,n;
-  static char nm[][6]={
-    "ITEMUP","WPNUP","GETPOW","ITMBK"
-  },snm[][4]={
-	"CLIP","SHEL","ROCK","CELL","AMMO","SBOX","BROK","CELP",
-	"STIM","MEDI","BPAK",
-	"CSAW","SHOT","SGN2","MGUN","LAUN","PLAS","BFUG"
-  },n4[][4]={
-    "SOUL","SMRT","SMGT","SMBT"
-  },n3[][4]={
-    "GOR1","FCAN"
+void IT_alloc (void) {
+  int i, j, n;
+  static char nm[][6] = {
+    "ITEMUP", "WPNUP", "GETPOW", "ITMBK"
   };
-
-//  logo("  items");
-  for(i=0;i<18;++i) spr[i]=Z_getspr(snm[i],0,0,sprd+i);
-  for(;i<20;++i) {
-	spr[i]=Z_getspr("ARM1",i-18,0,sprd+i);
-	spr[i+2]=Z_getspr("ARM2",i-18,0,sprd+i);
-  }i+=2;
-  for(;i<26;++i) spr[i]=Z_getspr("MEGA",i-22,0,sprd+i);
-  for(;i<30;++i) spr[i]=Z_getspr("PINV",i-26,0,sprd+i);
-  spr[30]=Z_getspr("AQUA",0,0,sprd+30);
-  spr[31]=Z_getspr("KEYR",0,0,sprd+31);
-  spr[32]=Z_getspr("KEYG",0,0,sprd+32);
-  spr[33]=Z_getspr("KEYB",0,0,sprd+33);
-  spr[34]=Z_getspr("SUIT",0,0,sprd+34);
-  for(n=35,j=0;j<4;++j)
-    for(i=0;i<4;++i,++n) spr[n]=Z_getspr(n4[j],i,0,sprd+n);
-  for(j=0;j<2;++j)
-    for(i=0;i<3;++i,++n) spr[n]=Z_getspr(n3[j],i,0,sprd+n);
-  spr[57]=Z_getspr("GUN2",0,0,sprd+57);
-  for(i=0;i<4;++i) snd[i]=Z_getsnd(nm[i]);
-  for(i=0;i<MAXITEM;++i) {it[i].o.r=10;it[i].o.h=8;}
+  for (i = 0; i < 4; ++i) {
+    snd[i] = Z_getsnd(nm[i]);
+  }
+  for (i = 0; i < MAXITEM; ++i) {
+    it[i].o.r = 10;
+    it[i].o.h = 8;
+  }
 }
 
-void IT_init(void) {
+void IT_init (void) {
   int i;
-
-  for(i=0;i<MAXITEM;++i) {
-	it[i].t=I_NONE;
-	it[i].o.xv=it[i].o.yv=it[i].o.vx=it[i].o.vy=0;
+  for (i = 0; i < MAXITEM; ++i) {
+    it[i].t = I_NONE;
+    it[i].o.xv = 0;
+    it[i].o.yv = 0;
+    it[i].o.vx = 0;
+    it[i].o.vy = 0;
   }
-  tsndtm=rsndtm=0;
+  tsndtm = 0;
+  rsndtm = 0;
 }
 
-int IT_load(FILE* h) {
-  int m,i,j;
+int IT_load (FILE *h) {
+  int m, i, j;
   old_thing_t t;
-
-  switch(blk.t) {
+  switch (blk.t) {
 	case MB_THING:
-	  for(i=0;blk.sz>0;++i,blk.sz-=8) {
-		myfread(&t,1,sizeof(t),h);
-    t.x = short2host(t.x);
-    t.y = short2host(t.y);
-    t.t = short2host(t.t);
-    t.f = short2host(t.f);
-		it[i].o.x=t.x;it[i].o.y=t.y;
-		it[i].t=t.t;it[i].s=t.f;
-		if(!it[i].t) break;
-		if((it[i].s&THF_DM) && !g_dm) it[i].t=0;
-	  }m=i;
-	  for(i=0,j=-1;i<m;++i) if(it[i].t==TH_PLR1) {j=i;it[i].t=0;}
-	  if(!g_dm) {
-		if(j==-1) ERR_fatal("Предмет игрок_1 не найден");
-		dm_pos[0].x=it[j].o.x;dm_pos[0].y=it[j].o.y;dm_pos[0].d=it[j].s&THF_DIR;
+	  for (i = 0; blk.sz > 0; ++i, blk.sz -= 8) {
+      t.x = myfread16(h);
+      t.y = myfread16(h);
+      t.t = myfread16(h);
+      t.f = myfread16(h);
+      it[i].o.x = t.x;
+      it[i].o.y = t.y;
+      it[i].t = t.t;
+      it[i].s = t.f;
+      if (it[i].t && (it[i].s & THF_DM) && !g_dm) {
+        it[i].t=0;
+      }
 	  }
-	  for(i=0,j=-1;i<m;++i) if(it[i].t==TH_PLR2) {j=i;it[i].t=0;}
-	  if(!g_dm && _2pl) {
-		if(j==-1) ERR_fatal("Предмет игрок_2 не найден");
-		dm_pos[1].x=it[j].o.x;dm_pos[1].y=it[j].o.y;dm_pos[1].d=it[j].s&THF_DIR;
+    m = i;
+	  for (i = 0, j = -1; i < m; ++i) {
+      if (it[i].t == TH_PLR1) {
+        j = i;
+        it[i].t = 0;
+      }
+    }
+	  if (!g_dm) {
+      if (j == -1) {
+        ERR_fatal("Предмет игрок_1 не найден");
+      }
+      dm_pos[0].x = it[j].o.x;
+      dm_pos[0].y = it[j].o.y;
+      dm_pos[0].d = it[j].s & THF_DIR;
 	  }
-	  for(i=0,j=0;i<m;++i) if(it[i].t==TH_DMSTART) {
-		if(g_dm)
-		  {dm_pos[j].x=it[i].o.x;dm_pos[j].y=it[i].o.y;dm_pos[j].d=it[i].s&THF_DIR;}
-		it[i].t=0;++j;
+	  for (i = 0, j = -1; i < m; ++i) {
+      if (it[i].t == TH_PLR2) {
+        j = i;
+        it[i].t = 0;
+      }
+    }
+	  if (!g_dm && _2pl) {
+      if (j == -1) {
+        ERR_fatal("Предмет игрок_2 не найден");
+      }
+      dm_pos[1].x = it[j].o.x;
+      dm_pos[1].y = it[j].o.y;
+      dm_pos[1].d = it[j].s & THF_DIR;
 	  }
-	  if(g_dm && j<2) ERR_fatal("Меньше 2-ух точек DM");
-	  if(g_dm) {
-	    dm_pnum=j;
-	    dm_pl1p=myrand(dm_pnum);
-	    do{ dm_pl2p=myrand(dm_pnum); }while(dm_pl2p==dm_pl1p);
-	  }else {dm_pl1p=0;dm_pl2p=1;dm_pnum=2;}
-	  PL_spawn(&pl1,dm_pos[dm_pl1p].x,dm_pos[dm_pl1p].y,dm_pos[dm_pl1p].d);
-	  if(_2pl) PL_spawn(&pl2,dm_pos[dm_pl2p].x,dm_pos[dm_pl2p].y,dm_pos[dm_pl2p].d);
-	  for(i=0;i<m;++i)
-		if(it[i].t>=TH_CLIP && it[i].t<TH_DEMON) {
-		  it[i].s=0;it[i].t=it[i].t-TH_CLIP+I_CLIP;
-		  if(it[i].t>=I_KEYR && it[i].t<=I_KEYB) it[i].t|=0x8000;
-		}else if(it[i].t>=TH_DEMON) {
-		  MN_spawn(it[i].o.x,it[i].o.y,it[i].s&THF_DIR,it[i].t-TH_DEMON+MN_DEMON);
-		  it[i].t=0;
-		}
+	  for (i = 0, j = 0; i < m; ++i) {
+      if (it[i].t == TH_DMSTART) {
+        if (g_dm) {
+          dm_pos[j].x = it[i].o.x;
+          dm_pos[j].y = it[i].o.y;
+          dm_pos[j].d = it[i].s & THF_DIR;
+        }
+        it[i].t = 0;
+        ++j;
+      }
+    }
+	  if (g_dm && j < 2) {
+      ERR_fatal("Меньше 2-ух точек DM");
+    }
+	  if (g_dm) {
+	    dm_pnum = j;
+	    dm_pl1p = myrand(dm_pnum);
+	    do {
+        dm_pl2p = myrand(dm_pnum);
+      } while (dm_pl2p == dm_pl1p);
+	  } else {
+      dm_pl1p = 0;
+      dm_pl2p = 1;
+      dm_pnum = 2;
+    }
+	  PL_spawn(&pl1, dm_pos[dm_pl1p].x, dm_pos[dm_pl1p].y, dm_pos[dm_pl1p].d);
+	  if (_2pl) {
+      PL_spawn(&pl2, dm_pos[dm_pl2p].x, dm_pos[dm_pl2p].y, dm_pos[dm_pl2p].d);
+    }
+	  for (i = 0; i < m; ++i) {
+      if (it[i].t >= TH_CLIP && it[i].t < TH_DEMON) {
+        it[i].s = 0;
+        it[i].t = it[i].t - TH_CLIP + I_CLIP;
+        if (it[i].t >= I_KEYR && it[i].t <= I_KEYB) {
+          it[i].t |= 0x8000;
+        }
+      } else if (it[i].t >= TH_DEMON) {
+        MN_spawn(it[i].o.x, it[i].o.y, it[i].s & THF_DIR, it[i].t - TH_DEMON + MN_DEMON);
+        it[i].t = 0;
+      }
+    }
 	  return 1;
-  }return 0;
+  }
+  return 0;
 }
 
-static void takesnd(int t) {
+static void takesnd (int t) {
   if(tsndtm) return;
   t&=0x7FFF;
   if(t<=I_CELP || (t>=I_BPACK && t<=I_BFG) || t==I_GUN2)
     {tsndtm=Z_sound(snd[1],128);return;}
   if(t==I_MEGA || t==I_INVL || t==I_SUPER)
     {tsndtm=Z_sound(snd[2],192);return;}
-  tsndtm=Z_sound(snd[0],256);
+  tsndtm=Z_sound(snd[0], 255);
 }
 
-void IT_act(void) {
+void IT_act (void) {
   int i,j;
 
   if(tsndtm) --tsndtm;
@@ -216,37 +213,7 @@ void IT_act(void) {
 	}
 }
 
-void IT_draw(void) {
-  int i,s;
-
-  for(i=0;i<MAXITEM;++i) {
-    s=-1;
-    if(it[i].t && it[i].s>=0) switch(it[i].t&0x7FFF) {
-          case I_ARM1:
-		s=it[i].s/9+18;break;
-	  case I_ARM2:
-		s=it[i].s/9+20;break;
-	  case I_MEGA:
-		s=it[i].s/2+22;break;
-	  case I_INVL:
-		s=it[i].s/2+26;break;
-	  case I_SUPER: case I_RTORCH: case I_GTORCH: case I_BTORCH:
-		s=it[i].s/2+(it[i].t-I_SUPER)*4+35;break;
-	  case I_GOR1: case I_FCAN:
-		s=it[i].s/2+(it[i].t-I_GOR1)*3+51;break;
-	  case I_AQUA: s=30;break;
-	  case I_SUIT: s=34;break;
-	  case I_KEYR: case I_KEYG: case I_KEYB:
-	    s=(it[i].t&0x7FFF)-I_KEYR+31;break;
-	  case I_GUN2: s=57;break;
-	  default:
-		s=(it[i].t&0x7FFF)-1;
-    }
-	if(s>=0) Z_drawspr(it[i].o.x,it[i].o.y,spr[s],sprd[s]);
-  }
-}
-
-void IT_spawn(int x,int y,int t) {
+void IT_spawn (int x,int y,int t) {
   int i;
 
   for(i=0;i<MAXITEM;++i) if(!it[i].t) {
@@ -258,7 +225,7 @@ void IT_spawn(int x,int y,int t) {
   }
 }
 
-void IT_drop_ammo(int t,int n,int x,int y) {
+void IT_drop_ammo (int t, int n, int x, int y) {
   static int an[8]={10,4,1,40,50,25,5,100};
   int a;