X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=blobdiff_plain;f=src%2Flib%2F16_tdef.h;h=f4b9d094553fde03019ab16c451c78c848285be5;hp=cd94df84bdc09fa1df7fe30baf57317706ca1fdf;hb=8db9019df22bf792ea02096dec8c3d862fa00155;hpb=3a2741ba173836748d0fa07e41f2c56c184cee8d

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index cd94df84..f4b9d094 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -84,6 +84,8 @@ typedef struct vrs_container{
 	};
 	// Array of corresponding vrl line offsets
 	vrl1_vgax_offset_t **vrl_line_offsets;
+	//sprite buffer
+	byte far _seg *spribuff;
 } vrs_container_t;
 
 typedef struct vrl_container{
@@ -96,6 +98,8 @@ typedef struct vrl_container{
 	};
 	// Pointer to a corresponding vrl line offsets struct
 	vrl1_vgax_offset_t *line_offsets;
+	//sprite buffer
+	byte far _seg *spribuff;
 } vrl_container_t;
 
 typedef struct sprite
@@ -362,7 +366,7 @@ typedef struct
 //===================================//
 #define PALSIZE			768	//vga
 #define NUMCHUNKS		416	//keen
-#define MAXSCANLINES	240	// size of ylookup table
+//#define MAXSCANLINES	240	// size of ylookup table
 
 #define MAXSHIFTS		4
 #define STARTSPRITES	0	//temp
@@ -396,7 +400,7 @@ typedef struct
 	word	quadwh;			//preproccessed quad size of tilewidth and tileheight
 } tile_dimention_t;
 
-#define MAXSCROLLEDGES 6
+#define MAXSCROLLEDGES 2
 typedef struct
 {
 	unsigned	panx,pany;		// panning adjustments inside port in pixels
@@ -453,7 +457,7 @@ typedef struct
 	word		bordercolor;
 	boolean	fastpalette;
 	byte		far	palette1[256][3],far palette2[256][3];
-	pictabletype	_seg *pictable;
+//????	pictabletype	_seg *pictable;
 	//keen/cata vars
 //	spritetabletype _seg *spritetable;
 //	unsigned	*shifttabletable[8];
@@ -493,11 +497,12 @@ typedef struct
 //from 16_mm
 //==========================================================================
 
-#define MAXBLOCKS		800//kd=1300 wolf3d=700 cata=600
+#define MAXBLOCKS		1024		//kd=1300 wolf3d=700 cata=600
 
 typedef struct mmblockstruct
 {
-	unsigned	start,length;
+	//word	start,length,		word	blob;	//for data larger than 64k
+	word	start;	dword length;
 	unsigned	attributes;
 	memptr		*useptr;	// pointer to the segment start
 	struct mmblockstruct far *next;
@@ -673,12 +678,12 @@ typedef struct
 //==========================================================================
 
 #define NOMAPS
-//#define NOGRAPHICS
+#define NOGRAPHICS
 #define NOAUDIO
 
-#define MAPHEADERLINKED
+//#define MAPHEADERLINKED
 //#define GRHEADERLINKED
-#define AUDIOHEADERLINKED
+//#define AUDIOHEADERLINKED
 
 #define NUMMAPS		4//39
 #define NUMSNDCHUNKS		4//3
@@ -692,9 +697,12 @@ typedef struct
 #define GDICTNAME	DATADIR"vgadict."
 #define GHEADNAME	DATADIR"vgahead."
 #define GFILENAME	DATADIR"vgagraph."
-#define EXTENSION	"hb1"
 
 
+#define MAPSEGBUF	mapsegs
+#define MAPSEGPTR	MAPSEGBUF[0]
+#define MAPSEGINLM	(gvar->ca.MAPSEGPTR)
+
 typedef struct
 {
   word bit0,bit1;	// 0-255 is a character, > is a pointer to a node
@@ -710,9 +718,10 @@ typedef	struct
 
 typedef struct
 {
-	int		mapon, mapnum;
-	maptype		_seg	*mapheaderseg[NUMMAPS];
-} ca_mapinfo_t;
+	unsigned	RLEWtag;
+	long		headeroffsets[100];
+	byte		tileinfo[];
+} mapfiletype;
 
 typedef struct
 {
@@ -733,9 +742,10 @@ typedef struct	//TODO: USE THIS!!!!
 {
 	byte	ca_levelbit,ca_levelnum;
 	ca_handle_t		file;		//files to open
-	ca_mapinfo_t	camap;
 
 	byte 		_seg	*tinf;//?? where in the id engine is this used and what is it? --sparky4
+	int		mapon, mapnum;
+	maptype		_seg	*mapheaderseg[NUMMAPS];
 	unsigned	_seg	*mapsegs[MAPPLANES];
 	void		_seg	*grsegs[NUMCHUNKS];
 	byte		far		grneeded[NUMCHUNKS];
@@ -747,20 +757,20 @@ typedef struct	//TODO: USE THIS!!!!
 #ifdef GRHEADERLINKED
 	huffnode	*grhuffman;
 #else
-	huffnode	grhuffman[255];
+	huffnode	grhuffman[63];
 #endif
 
 #ifdef AUDIOHEADERLINKED
 	huffnode	*audiohuffman;
 #else
-	huffnode	audiohuffman[255];
+	huffnode	audiohuffman[63];
 #endif
 
 	CASVT		chunkcomplen,chunkexplen;//long
 
 	sd_t		sd;
 	//TODO: extend! and learn from keen/wolf/catacomb's code wwww
-	memptr	spribuff;
+	memptr	spribuff;	//temp
 } ca_t;
 
 //==========================================================================