X-Git-Url: https://deadsoftware.ru/gitweb?p=flatwaifu.git;a=blobdiff_plain;f=src%2Fitems.h;h=bebb46deba69132b05a024d6cb75a2d2d3de426e;hp=2eff458258fd8e766aca9886309c21cd1b97253d;hb=efb17348438f10c929e2e9807013969f71802661;hpb=a46a1d55c077e3aa91a728047409050187e90083

diff --git a/src/items.h b/src/items.h
index 2eff458..bebb46d 100644
--- a/src/items.h
+++ b/src/items.h
@@ -19,33 +19,33 @@
    51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */
 
-// Items
+#ifndef ITEMS_H_INCLUDED
+#define ITEMS_H_INCLUDED
 
-#include <stdio.h>
+#include "view.h" // obj_t
 
 #define MAXITEM 300
 
-enum{I_NONE,I_CLIP,I_SHEL,I_ROCKET,I_CELL,I_AMMO,I_SBOX,I_RBOX,I_CELP,
-  I_STIM,I_MEDI,I_BPACK,I_CSAW,I_SGUN,I_SGUN2,I_MGUN,I_LAUN,I_PLAS,I_BFG,
-  I_ARM1,I_ARM2,I_MEGA,I_INVL,I_AQUA,I_KEYR,I_KEYG,I_KEYB,I_SUIT,I_SUPER,
-  I_RTORCH,I_GTORCH,I_BTORCH,I_GOR1,I_FCAN,I_GUN2
+enum {
+  I_NONE, I_CLIP, I_SHEL, I_ROCKET, I_CELL, I_AMMO, I_SBOX, I_RBOX, I_CELP,
+  I_STIM, I_MEDI, I_BPACK, I_CSAW, I_SGUN, I_SGUN2, I_MGUN, I_LAUN, I_PLAS, I_BFG,
+  I_ARM1, I_ARM2, I_MEGA, I_INVL, I_AQUA, I_KEYR, I_KEYG, I_KEYB, I_SUIT, I_SUPER,
+  I_RTORCH, I_GTORCH, I_BTORCH, I_GOR1, I_FCAN, I_GUN2
 };
 
-void IT_init(void);
-void IT_alloc(void);
-int IT_load(FILE*);
-void IT_act(void);
-void IT_draw(void);
-void IT_spawn(int x,int y,int i);
-void IT_drop_ammo(int i,int n,int x,int y);
-
-#pragma pack(1)
-typedef struct{
-  short x;
-  short y;
-  short t;
-  word f;
-}thing_t;
-#pragma pack()
+typedef struct {
+  obj_t o;
+  int t;
+  int s;
+} item_t;
 
+extern item_t it[MAXITEM];
 extern int itm_rtime;
+
+void IT_alloc (void);
+void IT_init (void);
+void IT_act (void);
+void IT_spawn (int x, int y, int t);
+void IT_drop_ammo (int t, int n, int x, int y);
+
+#endif /* ITEMS_H_INCLUDED */