got pcxtest.exe to compile and work

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

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 9022252..75ff0f2 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
@@ -188,6 +207,8 @@ typedef struct{
        sword tileplayerposscreeny;     /* player position on screen */ /* needed for scroll and map system to work accordingly */\r
 } pagetileinfo_t;\r
 \r
+#ifndef PAGET\r
+#define PAGET\r
 typedef struct {\r
        nibble/*word*/ id;      /* the Identification number of the page~ For layering~ */\r
        byte far* data; /* the data for the page */\r
@@ -206,6 +227,7 @@ typedef struct {
 //TODO: find where they are used\r
        sword delta;                    // How much should we shift the page for smooth scrolling\r
 } page_t;\r
+#endif\r
 \r
 //from 16_in\r
 //==========================================================================\r
@@ -316,8 +338,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
@@ -678,7 +700,7 @@ typedef enum {
 #define STARTPCSOUNDS          0\r
 #define STARTADLIBSOUNDS       87\r
 #define STARTDIGISOUNDS                174\r
-#define STARTMUSIC             261\r
+#define STARTMUSIC             0//++++261\r
 \r
 //\r
 // Music names & indexes\r