X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tdef.h;h=5621be818b2ccc31088f20f719028ff966e8dce0;hb=29204d5f82b02c730907d7cdf6760f291ae8e93e;hp=c1fe7c29a1e0653d2e7ca4875c16d06c7250a397;hpb=ea8488ca4e63f5789c8e06d87b38404446640887;p=16.git

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index c1fe7c29..5621be81 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -50,10 +50,10 @@ typedef struct {
 
 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 */
+	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 {
@@ -64,67 +64,6 @@ typedef struct {
 	byte *palette;
 } planar_buf_t;
 
-//TODO: 16_mm and 16_ca must handle this
-typedef struct {
-	bitmap_t far *data;		//old
-<<<<<<< HEAD
-	//planar_buf_t far *data;	//old
-=======
-	//planar_buf_t far *pbdata;	//old
->>>>>>> ee3674e42a19f516ea9a48df2c9f3593409141c6
-	word tileHeight, tileWidth;
-	unsigned int rows, cols;
-// 	#ifdef __DEBUG__
-// 	boolean debug_text;	//show the value of the tile! wwww
-// 	byte *debug_data;
-// 	#endif
-	byte	imgname[8];		//image file of tileset
-} tiles_t;
-
-//TODO: 16_mm and 16_ca must handle this
-//TODO: add variables from 16_ca
-#define MAPLAYERS 4
-typedef struct {
-	//long		planestart[3];
-	//unsigned	planelength[3];
-	byte *data;			//TODO: 16_mm and 16_ca must handle this
-	byte * far *layerdata;	//TODO: 16_mm and 16_ca must handle this
-	//tiles_t *tiles;		//TODO: 16_mm and 16_ca must handle this
-	tiles_t far *layertile[MAPLAYERS];	//TODO: 16_mm and 16_ca must handle this
-	int width, height;		//this has to be signed!
-	byte name[16];
-} map_t;
-
-typedef struct{
-	word tw;		/* screen width in tiles */
-	word th;		/* screen height in tiles */
-	word tilesw;		/* virtual screen width in tiles */
-	word tilesh;		/* virtual screen height in tiles */
-	sword tilemidposscreenx;	/* middle tile x position */	/* needed for scroll system to work accordingly */
-	sword tilemidposscreeny;	/* middle tile y position */	/* needed for scroll system to work accordingly */
-	sword tileplayerposscreenx;	/* player position on screen */	/* needed for scroll and map system to work accordingly */
-	sword tileplayerposscreeny;	/* player position on screen */	/* needed for scroll and map system to work accordingly */
-} tileinfo_t;
-
-typedef struct {
-	nibble/*word*/ id;	/* the Identification number of the page~ For layering~ */
-	byte far* data;	/* the data for the page */
-	tileinfo_t	ti;
-	word dx;		/* col we are viewing on virtual screen (on page[0]) */	/* off screen buffer on the left size */
-	word dy;		/* row we are viewing on virtual screen (on page[0]) */	/* off screen buffer on the top size */
-	word sw;		/* screen width */	/* resolution */
-	word sh;		/* screen heigth */	/* resolution */
-	word width;		/* virtual width of the page */
-	word height;	/* virtual height of the page */
-	word stridew;			/* width/4 */	/* VGA */
-	word pagesize;			/* page size */
-	word pi;				/* increment page by this much to preserve location */
-	int tlx,tly;
-//newer vars
-//TODO: find where they are used
-	sword delta;			// How much should we shift the page for smooth scrolling
-} page_t;
-
 //from 16_sprit.h
 #ifdef	__WATCOMC__
 typedef struct sprite
@@ -166,7 +105,7 @@ typedef	struct
 	word speed;		//entity speed!
 	word spt;		//speed per tile
 #ifdef	__WATCOMC__
-	sprite_t *spri; // sprite used by entity
+	sprite_t spri; // sprite used by entity
 #endif
 	sword hp; //hitpoints of the entity
 	nibble overdraww, overdrawh;	// how many pixels to "overdraw" so that moving sprites with edge pixels don't leave streaks.
@@ -174,6 +113,80 @@ typedef	struct
 	nibble /*int*/ persist_aniframe;    // gonna be increased to 1 before being used, so 0 is ok for default
 } entity_t;
 
+typedef	struct
+{
+	int x; //entity exact position on the viewable map
+	int y; //entity exact position on the viewable map
+	int tx; //entity tile position on the viewable map
+	int ty; //entity tile position on the viewable map
+
+#ifdef	__WATCOMC__
+	sprite_t spri; // sprite used by entity
+#endif
+	sword hp; //hitpoints of the entity
+} static_map_entity_t;
+
+//===========================================================================//
+
+//TODO: 16_mm and 16_ca must handle this
+typedef struct {
+#ifdef	__WATCOMC__
+	sprite_t *spri;			// I will probibaly use this --sparky4
+#endif
+	word tileHeight, tileWidth;	//defined by mapfile
+	unsigned int rows, cols;
+	byte	imgname[8];		//image file of tileset (set to 8 because DOS ^^;)
+} tiles_t;	//seems to be the tileset properties
+
+//TODO: 16_mm and 16_ca must handle this
+//TODO: add variables from 16_ca
+typedef struct {
+	byte	layername[8];
+	byte	*data;			//TODO: 16_mm and 16_ca must handle this
+} mapl_t;	//map layer array type def
+
+#define MAP_LAYERS 3
+typedef struct {
+	//long		planestart[3];
+	//unsigned	planelength[3];
+	mapl_t layerdata[MAP_LAYERS];	// mapdata for multilayer (map index values for rendering which image on the tile)
+	tiles_t *tiles;		//TODO: 16_mm and 16_ca must handle this	// tilesets for layers (currently ony 4 can be loaded wwww)
+	int width, height;		//this has to be signed!
+	byte name[16];
+} map_t;
+
+//===================================//
+
+typedef struct{
+	word tw;				/* screen width in tiles */
+	word th;				/* screen height in tiles */
+	word tilesw;				/* virtual screen width in tiles */
+	word tilesh;				/* virtual screen height in tiles */
+	sword tilemidposscreenx;	/* middle tile x position */	/* needed for scroll system to work accordingly */
+	sword tilemidposscreeny;	/* middle tile y position */	/* needed for scroll system to work accordingly */
+	sword tileplayerposscreenx;	/* player position on screen */	/* needed for scroll and map system to work accordingly */
+	sword tileplayerposscreeny;	/* player position on screen */	/* needed for scroll and map system to work accordingly */
+} pagetileinfo_t;
+
+typedef struct {
+	nibble/*word*/ id;	/* the Identification number of the page~ For layering~ */
+	byte far* data;	/* the data for the page */
+	pagetileinfo_t ti;	// the tile information of the page
+	word dx;		/* col we are viewing on virtual screen (on page[0]) */	/* off screen buffer on the left size */
+	word dy;		/* row we are viewing on virtual screen (on page[0]) */	/* off screen buffer on the top size */
+	word sw;		/* screen width */	/* resolution */
+	word sh;		/* screen heigth */	/* resolution */
+	word width;		/* virtual width of the page */
+	word height;	/* virtual height of the page */
+	word stridew;	/* width/4 */	/* VGA */
+	word pagesize;	/* page size */
+	word pi;		/* increment page by this much to preserve location */
+	int tlx,tly;
+//newer vars
+//TODO: find where they are used
+	sword delta;			// How much should we shift the page for smooth scrolling
+} page_t;
+
 //from 16_in
 //==========================================================================
 typedef	byte		ScanCode;
@@ -233,10 +246,10 @@ typedef	struct
 	entity_t near	enti;
 #ifdef	__WATCOMC__
 	//struct sprite	*spri;	//supposively the sprite sheet data
-	memptr		gr;
+	//memptr		gr;
 #endif
-	bitmap_t	*data;		//supposively the sprite sheet data//old format
-	bitmap_t	bmp;
+//	bitmap_t	*data;		//supposively the sprite sheet data//old format
+//	bitmap_t	bmp;
 
 	//input
 	byte near		pdir;	//previous direction~ used in IN_16 in IN_ReadControl()
@@ -263,20 +276,23 @@ typedef struct
 	word clock_start;	//timer start
 	word *clock;	//current time on clock
 	boolean fpscap;	//cap the fps var
+	nibble wcpu;	//stored value of cpu type
 } kurokku_t;
 
+//===================================//
+#define     PALSIZE            768
+#define NUMCHUNKS	416	//keen
 //video
 typedef struct
 {
 	unsigned int offscreen_ofs;
 	unsigned int pattern_ofs;
-} ofs_t;
-#define NUMCHUNKS	416	//keen
+} ofs_t;	//unfinished
 
 typedef struct
 {
 	char old_mode;		//old video mode before game!
-	byte palette[768];		//palette array
+	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
 	byte num_of_pages;	//number of actual pages