X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_tdef.h;h=730e7f964c016cf523b9766df95f5dd23553f39a;hb=00733c2c8a7f1c5a1b618af05c39235fdd203364;hp=1aa40e7f32b8e4a9322a88afa1a21c0dd3e6b894;hpb=c5070709fea9c16de70dd438e199d0a242cda8e9;p=16.git

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 1aa40e7f..730e7f96 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -108,16 +108,16 @@ typedef struct {
 	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 tw;		/* screen width in tiles */
-	word th;		/* screen height in tiles */
+		word tw;		/* screen width in tiles */
+		word th;		/* screen height in tiles */
 	word width;		/* virtual width of the page */
 	word height;	/* virtual height of the page */
-	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 */
+		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 */
 	word stridew;			/* width/4 */	/* VGA */
 	word pagesize;			/* page size */
 	word pi;				/* increment page by this much to preserve location */
@@ -137,13 +137,17 @@ typedef	struct
 	int triggery; //entity's trigger box tile position on the viewable map
 	int sheetsetx; //NOT USED YET! entity sprite sheet set on the image x
 	int sheetsety; //NOT USED YET! entity sprite sheet set on the image y
-	byte d;		//direction to render sprite!! wwww
-	byte q;		//loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www
+	nibble d;		//direction to render sprite!! wwww
+	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 spt;		//speed per tile
 	struct sprite *spri; // sprite used by entity
 	sword hp; //hitpoints of the entity
-	int persist_aniframe;    /* gonna be increased to 1 before being used, so 0 is ok for default */
+	nibble overdraww, overdrawh;	// how many pixels to "overdraw" so that moving sprites with edge pixels don't leave streaks.
+						// if the sprite's edge pixels are clear anyway, you can set this to 0.
+	nibble /*int*/ persist_aniframe;    // gonna be increased to 1 before being used, so 0 is ok for default
 } entity_t;
 
 //TODO: MAKE THIS WWWW
@@ -217,7 +221,6 @@ typedef	struct		{
 typedef	struct
 {
 	entity_t near	enti;
-	entity_t *ent;
 #ifdef	__WATCOMC__
 	//struct sprite	*spri;	//supposively the sprite sheet data
 	memptr		gr;
@@ -229,6 +232,7 @@ typedef	struct
 	byte near		pdir;	//previous direction~ used in IN_16 in IN_ReadControl()
 	CursorInfo		info;
 	ControlType	Controls;
+	word walktype;
 //newer vars
 	int dx, dy, delta;	//TODO: what is this? ^^
 } player_t;
@@ -257,6 +261,7 @@ typedef struct
 typedef struct
 {
 	char old_mode;		//old video mode before game!
+	byte palette[768];		//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
@@ -264,14 +269,16 @@ typedef struct
 	byte far * omemptr;
 	byte vga_draw_stride;
 	byte vga_draw_stride_limit;		// further X clipping
-//
-	word __near rs;			//render switch
+	//end of doslib origi vars
+	boolean __near rss;			//render sprite switch
+	sword __near sprifilei;		//player file's i
 	boolean __near p;			//render page number //BLEH
-	boolean __near r;			//page flip if true
+	boolean __near r;			//page flip, showpage, or render	if true
 	word pr[MAXPAGE][4];	//render sections of pages (this is supposed to be set up to draw sections of the screen if updated)
 
-	nibble sfip;//shinku_fps_indicator_page; // we're on page 1 now, shinku(). follow along please or it will not be visible.
+	nibble sfip;		//shinku_fps_indicator_page; // we're on page 1 now, shinku(). follow along please or it will not be visible.
 	nibble panp;		//pan_t replacement
+	word	vh;		//video combined height
 	//0000word startclk; float clk, tickclk;	//timer
 //newer vars
 //TODO: find out how they are used