X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tdef.h;h=083f2fc2b558a5856550f695049ecc1d24d1b971;hb=26f6c93f37031261bf32b695a416b897fe21171e;hp=b3fc892d87a81b609eb8e4d4d6e0d0d1c222cec7;hpb=b71a38de9e2c9e603ae664d9dceed0cdd64042f5;p=16.git

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index b3fc892d..083f2fc2 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-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -46,6 +46,16 @@
 /*
  * typedefs of the game variables!
  */
+typedef struct {
+	byte far *plane[4];	// 4 planes of image data
+	word width;			// width of the image (spread across 4 planes)
+	word height;		// height of the image (spread across 4 planes)
+	word pwidth;		// the number of bytes in each plane
+	byte *palette;
+} planar_buf_t;
+
+#ifndef BITMAPT
+#define BITMAPT
 typedef struct {
 	byte *data;
 	word width;
@@ -61,14 +71,7 @@ typedef struct {
 	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)
-	word height;		// height of the image (spread across 4 planes)
-	word pwidth;		// the number of bytes in each plane
-	byte *palette;
-} planar_buf_t;
+#endif
 
 //from 16_sprit.h
 #ifdef	__WATCOMC__
@@ -84,6 +87,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 +101,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 +141,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
@@ -328,8 +335,8 @@ typedef	struct
 	//struct sprite	*spri;	//supposively the sprite sheet data
 	//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()
@@ -346,6 +353,8 @@ typedef struct
 {
 	int profilehandle,debughandle,showmemhandle;
 	int heaphandle;
+	byte datadumpfilename[12];
+	byte heapdumpfilename[12];
 } loghandle_t;
 
 typedef struct
@@ -362,7 +371,7 @@ typedef struct
 //===================================//
 #define PALSIZE			768	//vga
 #define NUMCHUNKS		416	//keen
-#define MAXSCANLINES	240	// size of ylookup table
+//#define MAXSCANLINES	240	// size of ylookup table
 
 #define MAXSHIFTS		4
 #define STARTSPRITES	0	//temp
@@ -396,7 +405,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
@@ -406,6 +415,16 @@ typedef struct
 	int		hscrolledge[MAXSCROLLEDGES],vscrolledge[MAXSCROLLEDGES];
 } pan_t;
 
+typedef struct
+{
+	sword x;
+	sword y;
+	word t;
+	boolean tlsw;
+	word color;
+	word bgcolor;
+} modexprint_t;
+
 typedef struct
 {
 //----	ylookup[MAXSCANLINES],
@@ -446,6 +465,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
@@ -453,7 +473,7 @@ 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];
@@ -493,11 +513,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;
@@ -505,7 +526,7 @@ typedef struct mmblockstruct
 
 typedef struct mmshowmemoryinfo
 {
-	word x,y;
+//	unsigned x,y;
 	mmblocktype far *scan;
 } mmshowmemoryinfo_t;
 
@@ -649,6 +670,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
 {
@@ -665,6 +729,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;
 
 //==========================================================================
@@ -752,20 +817,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;
 
 //==========================================================================
@@ -795,6 +860,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;