p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

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

diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index c3c44c7c88db3f8610b37716f1ca93f49adf5224..962593c702d0c7389e6baa508834aa4a051b6284 100755 (executable)
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -35,14 +35,6 @@
 // #include "src/lib/modex16/192x144_.h"\r
 // #include "src/lib/modex16/160x120.h"\r
 \r
-#ifdef __WATCOMC__\r
-#include <hw/cpu/cpu.h>\r
-#include <hw/dos/dos.h>\r
-#include <hw/vga/vga.h>\r
-#include <hw/vga/vrl.h>\r
-#include <hw/vga/vrs.h>\r
-#endif\r
-\r
 //320x240 = 20x15\r
 //192x144 = 12x9\r
 \r
@@ -60,11 +52,11 @@
 \r
 // clips for rectangles not on 4s\r
 #define LRCLIPDEF \\r
-       byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08}; \\r
-       byte rclip[] = {0x00, 0x01, 0x03, 0x07};\r
+       static byte lclip[4] = {0x0f, 0x0e, 0x0c, 0x08}; \\r
+       static byte rclip[4] = {0x00, 0x01, 0x03, 0x07};\r
 \r
 #define VCLIPDEF \\r
-       byte pclip[] = {1,2,4,8};\r
+       static byte pclip[4] = {1,2,4,8};\r
 \r
 typedef union\r
 {\r
@@ -138,7 +130,7 @@ extern byte far*  VGA;  /* The VGA Memory */
 #define ATR_INDEX                      AC_INDEX\r
 #define ATR_OVERSCAN           17\r
 #define DISPLAY_ENABLE         0x01\r
-#define MAP_MASK               0x02\r
+//#define MAP_MASK             0x02\r
 #define PAL_READ_REG                   0x03C7   /* Color register, read address */\r
 #define PAL_WRITE_REG             0x03C8   /* Color register, write address */\r
 #define PAL_DATA_REG                   0x03C9   /* Color register, data port */\r
@@ -164,13 +156,16 @@ void VGAMAPMASK(byte x);
 void VGAWRITEMODE(byte x);\r
 void VGAREADMAP(byte x);\r
 \r
+#define VW_Hlin(x,z,y,c,q)     VL_Hlin(x,y,(z)-(x)+1,c,q)\r
+#define VW_Vlin(y,z,x,c,q)     VL_Vlin(x,y,(z)-(y)+1,c,q)\r
+\r
 /* -============================ Functions =============================- */\r
 /* mode switching, page, and plane functions */\r
 void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv);\r
 void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv);\r
 byte vgaGetMode();\r
+extern void TL_VidInit(global_game_variables_t *gvar);\r
 void modexLeave();\r
-void VL_SetLineWidth (unsigned width, ofs_t *ofs);\r
 void modexsetBaseXMode();\r
 page_t modexDefaultPage(page_t *p);\r
 page_t modexNextPage(page_t *p);\r
@@ -209,7 +204,7 @@ void modexPalWhite();
 \r
 /* utility functions */\r
 void modexPalUpdate(byte *p);\r
-void modexPalUpdate0(byte *p);\r
+void VL_modexPalScramble(byte *p);\r
 word modexPalOverscan(word col);\r
 void VL_Plot (int x, int y, int color, ofs_t *ofs);\r
 void VL_Hlin (unsigned x, unsigned y, unsigned width, unsigned color, ofs_t *ofs);\r
@@ -254,6 +249,7 @@ void modexWaitBorder();
 void modexWaitBorder_start();\r
 void modexWaitBorder_end();\r
 void VL_WaitVBL(word num);\r
+void VL_SetLineWidth (unsigned width, ofs_t *ofs);\r
 void VL_PrintmodexmemInfo(video_t *v);\r
 \r
 #endif\r