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

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index fac2ba26..f4b9d094 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -37,6 +37,12 @@
 
 #define MAXPAGE 4
 
+#define BDOFSCONV (unsigned __near)
+#define BOFS page[1].data
+#define DOFS page[0].data
+
+#define CONFIGNAME "config.16"
+
 /*
  * typedefs of the game variables!
  */
@@ -78,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{
@@ -90,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
@@ -354,9 +364,34 @@ 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
+{
+	int width,height;
+} pictabletype;
 
 //video
 typedef struct
@@ -365,11 +400,24 @@ typedef struct
 	word	quadwh;			//preproccessed quad size of tilewidth and tileheight
 } tile_dimention_t;
 
+#define MAXSCROLLEDGES 2
+typedef struct
+{
+	unsigned	panx,pany;		// panning adjustments inside port in pixels
+	unsigned	pansx,pansy;
+	unsigned	panadjust;		// panx/pany adjusted by screen resolution
+	int		hscrollblocks,vscrollblocks;
+	int		hscrolledge[MAXSCROLLEDGES],vscrolledge[MAXSCROLLEDGES];
+} pan_t;
+
 typedef struct
 {
+//----	ylookup[MAXSCANLINES],
 	unsigned int offscreen_ofs;
 	unsigned int pattern_ofs;
-	unsigned	bufferofs,	ylookup[MAXSCANLINES], linewidth,displayofs;
+//+-+-	unsigned	bufferofs,linewidth,displayofs;
+	pan_t		pan;
+
 } ofs_t;	//unfinished
 
 typedef struct
@@ -385,10 +433,10 @@ typedef struct
 
 typedef struct
 {
-	boolean	VL_Started;
+	boolean	VL_Started,VL_Initiated;
 	char old_mode;		//old video mode before game!
+	sword curr_mode;		//modex curent mode
 	byte palette[PALSIZE], dpal[PALSIZE];	//palette array
-	byte		far	palette1[256][3],far palette2[256][3];
 	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
@@ -408,6 +456,11 @@ typedef struct
 	boolean	screenfaded;
 	word		bordercolor;
 	boolean	fastpalette;
+	byte		far	palette1[256][3],far palette2[256][3];
+//????	pictabletype	_seg *pictable;
+	//keen/cata vars
+//	spritetabletype _seg *spritetable;
+//	unsigned	*shifttabletable[8];
 } video_t;
 
 //from scroll16
@@ -419,6 +472,7 @@ typedef struct
 	int tx,ty; //appears to be the top left tile position on the viewable screen map
 	word dxThresh,dyThresh; //Threshold for physical tile switch
 	video_t *video;	//pointer to game variables of the video
+	kurokku_t *kurokku;	//pointer to game variables of the kurokku
 	nibble __near *p;	// pointer to video's render page num
 	nibble __near *sp;	// pointer to video's show page num
 	int dx, dy;	// draw row and col var
@@ -443,19 +497,23 @@ typedef struct
 //from 16_mm
 //==========================================================================
 
-#define MAXBLOCKS		1024//kd=1300 wolf3d=700 cata=600
-//----#define MAXUMBS		12
+#define MAXBLOCKS		1024		//kd=1300 wolf3d=700 cata=600
 
 typedef struct mmblockstruct
 {
-	word	start,length;
-	//word	start;	dword length;
-//++++	word	blob;	//for data larger than 64k
+	//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;
 } mmblocktype;
 
+typedef struct mmshowmemoryinfo
+{
+	word x,y;
+	mmblocktype far *scan;
+} mmshowmemoryinfo_t;
+
 typedef struct
 {
 	dword	nearheap,farheap,EMSmem,XMSmem,mainmem;
@@ -594,11 +652,56 @@ typedef struct
 
 //==========================================================================
 
+//for 16_sd
+//==========================================================================
+#pragma pack(push,1)
+typedef struct imf_entry
+{
+	byte		reg,data;
+	word		delay;
+} imf_entry_t;
+#pragma pack(pop)
+
+typedef struct
+{
+	volatile unsigned long irq0_ticks;//=0;
+	volatile unsigned int irq0_cnt,irq0_add,irq0_max;//=0;
+	imf_entry_t*	imf_music;//=NULL;
+	imf_entry_t*	imf_play_ptr;//=NULL;
+	imf_entry_t*	imf_music_end;//=NULL;
+	word		imf_delay_countdown;//=0;
+} sd_t;
+
+//==========================================================================
+
 //from 16_ca
 //==========================================================================
 
+#define NOMAPS
+#define NOGRAPHICS
+#define NOAUDIO
+
+//#define MAPHEADERLINKED
+//#define GRHEADERLINKED
+//#define AUDIOHEADERLINKED
+
 #define NUMMAPS		4//39
-#define NUMSNDCHUNKS		84
+#define NUMSNDCHUNKS		4//3
+//#define NUMPICS		4//132//wolf3d wl6
+
+#define STRUCTPIC	0
+#define CASVT		dword	//*start var type
+
+
+#define DATADIR		"data/"
+#define GDICTNAME	DATADIR"vgadict."
+#define GHEADNAME	DATADIR"vgahead."
+#define GFILENAME	DATADIR"vgagraph."
+
+
+#define MAPSEGBUF	mapsegs
+#define MAPSEGPTR	MAPSEGBUF[0]
+#define MAPSEGINLM	(gvar->ca.MAPSEGPTR)
 
 typedef struct
 {
@@ -615,15 +718,16 @@ typedef	struct
 
 typedef struct
 {
-	int		mapon, mapnum;
-	maptype		_seg	*mapheaderseg[NUMMAPS];
-} ca_mapinfo_t;
+	unsigned	RLEWtag;
+	long		headeroffsets[100];
+	byte		tileinfo[];
+} mapfiletype;
 
 typedef struct
 {
-	int			maphandle[4];		// handle to MAPTEMP / GAMEMAPS
-	int			grhandle[4];		// handle to EGAGRAPH
-	int			audiohandle[4];	// handle to AUDIOT / AUDIO
+	int			maphandle;		// handle to MAPTEMP / GAMEMAPS
+	int			grhandle;		// handle to EGAGRAPH
+	int			audiohandle;	// handle to AUDIOT / AUDIO
 } ca_handle_t;
 /*
 16/wf3d8086/id_ca.c:	grstarts = (long _seg *)FP_SEG(&EGAhead);
@@ -638,21 +742,35 @@ 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];
 	word		_seg *audiosegs[NUMSNDCHUNKS];//long
 
-	word		_seg	*grstarts;	// array of offsets in egagraph, -1 for sparse//long
-	word		_seg	*audiostarts;	// array of offsets in audio / audiot//long
+	CASVT		_seg	*grstarts;	// array of offsets in egagraph, -1 for sparse//long
+	CASVT		_seg	*audiostarts;	// array of offsets in audio / audiot//long
 
-	huffnode huffnode;
+#ifdef GRHEADERLINKED
+	huffnode	*grhuffman;
+#else
+	huffnode	grhuffman[63];
+#endif
+
+#ifdef AUDIOHEADERLINKED
+	huffnode	*audiohuffman;
+#else
+	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;
 
 //==========================================================================
@@ -666,7 +784,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
 {
@@ -680,11 +801,7 @@ typedef struct glob_game_vars
 	player_t	player[MaxPlayers];	// player vars
 	map_view_t	mv[4];
 //	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_ */