X-Git-Url: https://deadsoftware.ru/gitweb?p=flatwaifu.git;a=blobdiff_plain;f=src%2Fview.h;h=a88e0f69b60caebe91f87476c41768762d5bc942;hp=5f1aad947d8cc55f949f76ac62a7400925a5a6c0;hb=563dffaf02ff36da4054f937fcc9f99a072e15bf;hpb=d070670f189ec66ed2ac6b45834a192c004bc92f

diff --git a/src/view.h b/src/view.h
index 5f1aad9..a88e0f6 100644
--- a/src/view.h
+++ b/src/view.h
@@ -20,36 +20,11 @@
    51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */
 
-// View functions
-
 #ifndef VIEW_H_INCLUDED
 #define VIEW_H_INCLUDED
 
-#include <stdio.h>
-
-
-// object data structure
-#pragma pack(1)
-typedef struct{
-  int x,y;		// coordinates
-  int xv,yv;		// velocity
-  int vx,vy;
-  int r,h;		// radius, height
-}obj_t;
-
-
-typedef struct{
-  int x,y;
-  byte d;
-}pos_t;
-#pragma pack()
-
-enum{HIT_SOME,HIT_ROCKET,HIT_BFG,HIT_TRAP,HIT_WATER,HIT_ELECTRO,HIT_FLAME};
-
-enum{
-  GS_TITLE,GS_GAME,GS_INTER,GS_DARKEN,GS_ENDANIM,GS_END2ANIM,GS_ENDSCR,
-  GS_BVIDEO,GS_EVIDEO,GS_END3ANIM
-};
+#include "glob.h"
+#include <stdio.h> // FILE
 
 #define FLDW 100
 #define FLDH 100
@@ -58,40 +33,39 @@ enum{
 #define MAXTXW 16
 #define MAXTXH 8
 
-#pragma pack(1)
-
-typedef struct{
-  char n[8];
-  char t;
-}wall_t;
-
-#pragma pack()
+enum {
+  HIT_SOME, HIT_ROCKET, HIT_BFG, HIT_TRAP, HIT_WATER, HIT_ELECTRO, HIT_FLAME
+};
 
-extern dword walf[256];
-extern byte walswp[256];
+enum {
+  GS_TITLE, GS_GAME, GS_INTER, GS_DARKEN, GS_ENDANIM, GS_END2ANIM, GS_ENDSCR,
+  GS_BVIDEO, GS_EVIDEO, GS_END3ANIM
+};
 
-void W_init(void);
+typedef struct {
+  int x, y;		// coordinates
+  int xv, yv;		// velocity
+  int vx, vy;
+  int r, h;		// radius, height
+} obj_t;
 
-int W_load(FILE*);
-int G_load(FILE*);
+typedef struct {
+  int x, y;
+  byte d;
+} pos_t;
 
-void G_init(void);
-void G_start(void);
-void G_act(void);
-void G_draw(void);
+typedef struct {
+  char n[8];
+  char t;
+} wall_t;
 
-extern byte walswp[256];
-extern byte _2pl,g_dm,g_st,g_exit,w_horiz,g_map;
-extern int g_sttm;
-extern dword g_time;
-extern int w_o,w_x,w_y;
+extern int sky_type;
+extern dword walf[256];
 extern byte fldb[FLDH][FLDW];
 extern byte fldf[FLDH][FLDW];
 extern byte fld[FLDH][FLDW];
-extern pos_t dm_pos[];
-extern int dm_pnum,dm_pl1p,dm_pl2p;
 
-extern int WD; //
-extern int HT; //
+void W_init (void);
+int W_load (FILE *h);
 
 #endif /* VIEW_H_INCLUDED */