X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tdef.h;h=2d3e606722ce5748d135d47b09396111e0e97567;hb=d09e91b0ef220dbfd79d1aa8470668f16c0b6e24;hp=ffa22c0183a4ea1a70b9ce23265e65a36ebfeed2;hpb=9dceac8c26077833f033c86e39d916b112c9d025;p=16.git

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index ffa22c01..2d3e6067 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -46,22 +46,6 @@
 /*
  * typedefs of the game variables!
  */
-typedef struct {
-	byte *data;
-	word width;
-	word height;
-	byte *palette;
-	word offset;
-} bitmap_t;
-
-typedef struct {
-	byte far **data;
-	word ntiles;		// the number of tiles
-	word twidth;	// width of the tiles
-	word theight;	// height of the tiles
-	byte *palette;	// palette for the tile set
-} tileset_t;
-
 typedef struct {
 	byte far *plane[4];	// 4 planes of image data
 	word width;			// width of the image (spread across 4 planes)
@@ -138,7 +122,7 @@ typedef	struct
 	nibble pred;	//prev. direction for animation changing
 	word dire;		//sprite in use
 	nibble q;		//loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www
-	word speed;		//entity speed!
+//	word speed;		//entity speed!
 	word spt;		//speed per tile
 #ifdef	__WATCOMC__
 	sprite_t spri; // sprite used by entity
@@ -350,6 +334,8 @@ typedef struct
 {
 	int profilehandle,debughandle,showmemhandle;
 	int heaphandle;
+	byte datadumpfilename[12];
+	byte heapdumpfilename[12];
 } loghandle_t;
 
 typedef struct
@@ -400,7 +386,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
@@ -497,11 +483,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,		blob;	//for data larger than 64k
+	word	start;	dword length;
 	unsigned	attributes;
 	memptr		*useptr;	// pointer to the segment start
 	struct mmblockstruct far *next;
@@ -744,7 +731,7 @@ typedef struct	//TODO: USE THIS!!!!
 
 	byte 		_seg	*tinf;//?? where in the id engine is this used and what is it? --sparky4
 	int		mapon, mapnum;
-//	maptype		_seg	*mapheaderseg[NUMMAPS];
+	maptype		_seg	*mapheaderseg[NUMMAPS];
 	unsigned	_seg	*mapsegs[MAPPLANES];
 	void		_seg	*grsegs[NUMCHUNKS];
 	byte		far		grneeded[NUMCHUNKS];
@@ -769,6 +756,7 @@ typedef struct	//TODO: USE THIS!!!!
 
 	sd_t		sd;
 	//TODO: extend! and learn from keen/wolf/catacomb's code wwww
+	memptr	spribuff[64];	//temp
 } ca_t;
 
 //==========================================================================
@@ -798,6 +786,7 @@ typedef struct glob_game_vars
 	in_info_t	in;		// 16_in info
 	player_t	player[MaxPlayers];	// player vars
 	map_view_t	mv[4];
+	map_t		map;
 //	sw_t		sw;
 	boolean	DLStarted;
 } global_game_variables_t;