X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tdef.h;h=a949a7e14b61677b298dc257b01c71184b5c779a;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=ffc4ae6f136988396310a5131cc10386c694624a;hpb=18e1b0c530d68a65c6e9434b03ad8df4c1985a1a;p=16.git

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index ffc4ae6f..a949a7e1 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -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)
@@ -84,6 +68,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 +82,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
@@ -134,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
@@ -346,6 +334,8 @@ typedef struct
 {
 	int profilehandle,debughandle,showmemhandle;
 	int heaphandle;
+	byte datadumpfilename[12];
+	byte heapdumpfilename[12];
 } loghandle_t;
 
 typedef struct
@@ -360,9 +350,29 @@ typedef struct
 } kurokku_t;
 
 //===================================//
-#define PALSIZE	768
-#define NUMCHUNKS	416	//keen
-#define MAXSCANLINES	240			// size of ylookup table
+#define PALSIZE			768	//vga
+#define NUMCHUNKS		416	//keen
+//#define MAXSCANLINES	240	// size of ylookup table
+
+#define MAXSHIFTS		4
+#define STARTSPRITES	0	//temp
+
+typedef struct
+{
+	int	width,
+		height,
+		orgx,orgy,
+		xl,yl,xh,yh,
+		shifts;
+} spritetabletype;
+
+typedef	struct
+{
+	unsigned	sourceoffset[MAXSHIFTS];
+	unsigned	planesize[MAXSHIFTS];
+	unsigned	width[MAXSHIFTS];
+	byte		data[];
+} spritetype;		// the memptr for each sprite points to this
 
 typedef struct
 {
@@ -376,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
@@ -388,10 +398,20 @@ typedef struct
 
 typedef struct
 {
-	//ylookup[MAXSCANLINES],
+	sword x;
+	sword y;
+	word t;
+	boolean tlsw;
+	word color;
+	word bgcolor;
+} modexprint_t;
+
+typedef struct
+{
+//----	ylookup[MAXSCANLINES],
 	unsigned int offscreen_ofs;
 	unsigned int pattern_ofs;
-//	unsigned	bufferofs,linewidth,displayofs;
+//+-+-	unsigned	bufferofs,linewidth,displayofs;
 	pan_t		pan;
 
 } ofs_t;	//unfinished
@@ -426,6 +446,7 @@ typedef struct
 	nibble sfip;		//shinku_fps_indicator_page; // we're on page 1 now, shinku(). follow along please or it will not be visible.
 	ofs_t	ofs;		//offset vars used for doslib
 	word	vh;		//video combined height
+	modexprint_t	print;	//modexprint variables
 	tile_dimention_t	td;
 	//0000word startclk; float clk, tickclk;	//timer
 	//wolf3d vars
@@ -433,7 +454,10 @@ 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];
 } video_t;
 
 //from scroll16
@@ -470,11 +494,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;
@@ -482,7 +507,7 @@ typedef struct mmblockstruct
 
 typedef struct mmshowmemoryinfo
 {
-	word x,y;
+//	unsigned x,y;
 	mmblocktype far *scan;
 } mmshowmemoryinfo_t;
 
@@ -626,6 +651,49 @@ typedef struct
 
 //for 16_sd
 //==========================================================================
+
+/////////////////////////////////////////////////
+//
+// MUSE Header for .WL6
+// Created Tue Jul 14 15:04:53 1992
+//
+/////////////////////////////////////////////////
+
+#define NUMSOUNDS		87
+//--#define NUMSNDCHUNKS		288
+
+//
+// Sound names & indexes
+//
+typedef enum {
+		HITWALLSND,              // 0
+		SELECTWPNSND,            // 1
+		SELECTITEMSND,           // 2
+		LASTSOUND
+	     } soundnames;
+
+//
+// Base offsets
+//
+#define STARTPCSOUNDS		0
+#define STARTADLIBSOUNDS	87
+#define STARTDIGISOUNDS		174
+#define STARTMUSIC		0//++++261
+
+//
+// Music names & indexes
+//
+typedef enum {
+		CORNER_MUS,              // 0
+		LASTMUSIC
+	     } musicnames;
+
+/////////////////////////////////////////////////
+//
+// Thanks for playing with MUSE!
+//
+/////////////////////////////////////////////////
+
 #pragma pack(push,1)
 typedef struct imf_entry
 {
@@ -642,6 +710,7 @@ typedef struct
 	imf_entry_t*	imf_play_ptr;//=NULL;
 	imf_entry_t*	imf_music_end;//=NULL;
 	word		imf_delay_countdown;//=0;
+	dword		ptick,tickrate;
 } sd_t;
 
 //==========================================================================
@@ -650,12 +719,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
@@ -669,9 +738,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
@@ -687,9 +759,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
 {
@@ -710,9 +783,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];
@@ -724,20 +798,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[64];	//temp
 } ca_t;
 
 //==========================================================================
@@ -751,7 +825,10 @@ typedef struct {
 	vidsw_t vsw;
 } sw_t;*/
 
-
+#ifdef __WATCOMC__
+extern char global_temp_status_text[512];
+extern char global_temp_status_text2[512];
+#endif
 
 typedef struct glob_game_vars
 {
@@ -764,13 +841,9 @@ 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;
 
-#ifdef __WATCOMC__
-extern char global_temp_status_text[512];
-extern char global_temp_status_text2[512];
-#define EINVFMT EMFILE
-#endif
 #endif /* _TYPEDEFSTRUCT_H_ */