compiled on 1.9

[16.git] / src / lib / 16_tdef.h

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index bb886801f6c9d12ca7b82cee2261f6d61b95558d..083f2fc2b558a5856550f695049ecc1d24d1b971 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -54,6 +54,25 @@ typedef struct {
        byte *palette;\r
 } planar_buf_t;\r
 \r
+#ifndef BITMAPT\r
+#define BITMAPT\r
+typedef struct {\r
+       byte *data;\r
+       word width;\r
+       word height;\r
+       byte *palette;\r
+       word offset;\r
+} bitmap_t;\r
+\r
+typedef struct {\r
+       byte far **data;\r
+       word ntiles;            // the number of tiles\r
+       word twidth;    // width of the tiles\r
+       word theight;   // height of the tiles\r
+       byte *palette;  // palette for the tile set\r
+} tileset_t;\r
+#endif\r
+\r
 //from 16_sprit.h\r
 #ifdef __WATCOMC__\r
 #include <hw/vga/vrl.h>\r
@@ -316,8 +335,8 @@ typedef     struct
        //struct sprite *spri;  //supposively the sprite sheet data\r
        //memptr                gr;\r
 #endif\r
-//     bitmap_t        *data;          //supposively the sprite sheet data//old format\r
-//     bitmap_t        bmp;\r
+       bitmap_t        *data;          //supposively the sprite sheet data//old format\r
+       bitmap_t        bmp;\r
 \r
        //input\r
        byte near               pdir;   //previous direction~ used in IN_16 in IN_ReadControl()\r
@@ -396,6 +415,16 @@ typedef struct
        int             hscrolledge[MAXSCROLLEDGES],vscrolledge[MAXSCROLLEDGES];\r
 } pan_t;\r
 \r
+typedef struct\r
+{\r
+       sword x;\r
+       sword y;\r
+       word t;\r
+       boolean tlsw;\r
+       word color;\r
+       word bgcolor;\r
+} modexprint_t;\r
+\r
 typedef struct\r
 {\r
 //---- ylookup[MAXSCANLINES],\r
@@ -436,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.\r
        ofs_t   ofs;            //offset vars used for doslib\r
        word    vh;             //video combined height\r
+       modexprint_t    print;  //modexprint variables\r
        tile_dimention_t        td;\r
        //0000word startclk; float clk, tickclk;        //timer\r
        //wolf3d vars\r
@@ -640,6 +670,49 @@ typedef struct
 \r
 //for 16_sd\r
 //==========================================================================\r
+\r
+/////////////////////////////////////////////////\r
+//\r
+// MUSE Header for .WL6\r
+// Created Tue Jul 14 15:04:53 1992\r
+//\r
+/////////////////////////////////////////////////\r
+\r
+#define NUMSOUNDS              87\r
+//--#define NUMSNDCHUNKS               288\r
+\r
+//\r
+// Sound names & indexes\r
+//\r
+typedef enum {\r
+               HITWALLSND,              // 0\r
+               SELECTWPNSND,            // 1\r
+               SELECTITEMSND,           // 2\r
+               LASTSOUND\r
+            } soundnames;\r
+\r
+//\r
+// Base offsets\r
+//\r
+#define STARTPCSOUNDS          0\r
+#define STARTADLIBSOUNDS       87\r
+#define STARTDIGISOUNDS                174\r
+#define STARTMUSIC             0//++++261\r
+\r
+//\r
+// Music names & indexes\r
+//\r
+typedef enum {\r
+               CORNER_MUS,              // 0\r
+               LASTMUSIC\r
+            } musicnames;\r
+\r
+/////////////////////////////////////////////////\r
+//\r
+// Thanks for playing with MUSE!\r
+//\r
+/////////////////////////////////////////////////\r
+\r
 #pragma pack(push,1)\r
 typedef struct imf_entry\r
 {\r
@@ -656,6 +729,7 @@ typedef struct
        imf_entry_t*    imf_play_ptr;//=NULL;\r
        imf_entry_t*    imf_music_end;//=NULL;\r
        word            imf_delay_countdown;//=0;\r
+       dword           ptick,tickrate;\r
 } sd_t;\r
 \r
 //==========================================================================\r