diff --git a/src/view.h b/src/view.h
index 5f1aad947d8cc55f949f76ac62a7400925a5a6c0..d2fd96ea603d370e6580f2feb87fe33707382158 100644 (file)
--- a/src/view.h
+++ b/src/view.h
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
#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);
#endif /* VIEW_H_INCLUDED */