X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tdef.h;h=fb905910af6e3aa7ab23386a3c405f73f91c48a6;hb=e62d9fad29bbc049320ec69914aefd43c0f62f78;hp=2d3e606722ce5748d135d47b09396111e0e97567;hpb=7f33f5e74cc6486faa7182f3a12f214180e118fd;p=16.git

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 2d3e6067..fb905910 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.
  *
@@ -54,6 +54,22 @@ typedef struct {
 	byte *palette;
 } planar_buf_t;
 
+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;
+
 //from 16_sprit.h
 #ifdef	__WATCOMC__
 #include <hw/vga/vrl.h>
@@ -316,8 +332,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()
@@ -396,6 +412,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],
@@ -436,6 +462,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
@@ -496,7 +523,7 @@ typedef struct mmblockstruct
 
 typedef struct mmshowmemoryinfo
 {
-	word x,y;
+//	unsigned x,y;
 	mmblocktype far *scan;
 } mmshowmemoryinfo_t;
 
@@ -640,6 +667,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
 {
@@ -656,6 +726,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;
 
 //==========================================================================