X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tdef.h;h=f45195d698b9a93d9336987d3ed69157b18a4a1e;hb=28b1be191222717943878f024cddac30b026318e;hp=341ada31e809f6669635243f4f045fb909bfc04a;hpb=cecbe84f7c61a26fa2285fc125839b2ff50a7f51;p=16.git

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 341ada31..f45195d6 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -37,6 +37,10 @@
 
 #define MAXPAGE 4
 
+#define BDOFSCONV (unsigned __near)
+#define BOFS page[1].data
+#define DOFS page[0].data
+
 /*
  * typedefs of the game variables!
  */
@@ -358,6 +362,11 @@ typedef struct
 #define NUMCHUNKS	416	//keen
 #define MAXSCANLINES	240			// size of ylookup table
 
+typedef struct
+{
+	int width,height;
+} pictabletype;
+
 //video
 typedef struct
 {
@@ -377,10 +386,12 @@ typedef struct
 
 typedef struct
 {
+	//ylookup[MAXSCANLINES],
 	unsigned int offscreen_ofs;
 	unsigned int pattern_ofs;
-	unsigned	bufferofs,	ylookup[MAXSCANLINES], linewidth,displayofs;
+//	unsigned	bufferofs,linewidth,displayofs;
 	pan_t		pan;
+
 } ofs_t;	//unfinished
 
 typedef struct
@@ -398,6 +409,7 @@ typedef struct
 {
 	boolean	VL_Started,VL_Initiated;
 	char old_mode;		//old video mode before game!
+	sword curr_mode;		//modex curent mode
 	byte palette[PALSIZE], dpal[PALSIZE];	//palette array
 	page_t page[MAXPAGE];	//can be used as a pointer to root page[0]
 	word vmem_remain;	//remaining video memory
@@ -419,6 +431,7 @@ typedef struct
 	word		bordercolor;
 	boolean	fastpalette;
 	byte		far	palette1[256][3],far palette2[256][3];
+	pictabletype	_seg *pictable;
 } video_t;
 
 //from scroll16
@@ -468,6 +481,12 @@ typedef struct mmblockstruct
 	struct mmblockstruct far *next;
 } mmblocktype;
 
+typedef struct mmshowmemoryinfo
+{
+	word x,y;
+	mmblocktype far *scan;
+} mmshowmemoryinfo_t;
+
 typedef struct
 {
 	dword	nearheap,farheap,EMSmem,XMSmem,mainmem;
@@ -631,8 +650,27 @@ typedef struct
 //from 16_ca
 //==========================================================================
 
+#define NOMAPS
+//#define NOGRAPHICS
+#define NOAUDIO
+
+#define MAPHEADERLINKED
+//#define GRHEADERLINKED
+#define AUDIOHEADERLINKED
+
 #define NUMMAPS		4//39
-#define NUMSNDCHUNKS		84
+#define NUMSNDCHUNKS		4//3
+//#define NUMPICS		132//wolf3d wl6
+
+#define STRUCTPIC	0
+
+
+#define DATADIR		"data/"
+#define GDICTNAME	DATADIR"vgadict."
+#define GHEADNAME	DATADIR"vgahead."
+#define GFILENAME	DATADIR"vgagraph."
+#define EXTENSION	"hb1"
+
 
 typedef struct
 {
@@ -683,7 +721,19 @@ typedef struct	//TODO: USE THIS!!!!
 	word		_seg	*grstarts;	// array of offsets in egagraph, -1 for sparse//long
 	word		_seg	*audiostarts;	// array of offsets in audio / audiot//long
 
-	huffnode	huffnode;
+#ifdef GRHEADERLINKED
+	huffnode	*grhuffman;
+#else
+	huffnode	grhuffman[255];
+#endif
+
+#ifdef AUDIOHEADERLINKED
+	huffnode	*audiohuffman;
+#else
+	huffnode	audiohuffman[255];
+#endif
+
+	long		chunkcomplen,chunkexplen;
 
 	sd_t		sd;
 	//TODO: extend! and learn from keen/wolf/catacomb's code wwww
@@ -715,6 +765,7 @@ typedef struct glob_game_vars
 	player_t	player[MaxPlayers];	// player vars
 	map_view_t	mv[4];
 //	sw_t		sw;
+	boolean	DLStarted;
 } global_game_variables_t;
 
 #ifdef __WATCOMC__