got pcxtest.exe to compile and work

[16.git] / src / pcxtest2.c

diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index aea2eb9a542bfecb1ca81e07808547083a5f0472..dadb2c459d26acce04d3103bfc78a0d73e32e251 100755 (executable)
--- a/src/pcxtest2.c
+++ b/src/pcxtest2.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123\r
+ * Copyright (C) 2012-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -23,11 +23,11 @@
 #include <stdio.h>\r
 #include <dos.h>\r
 #include <string.h>\r
-#include "src/lib/modex16.h"\r
-#include "src/lib/bitmap.h"\r
-#include "src/lib/planar.h"\r
+#include "src/lib/16_vl.h"\r
+//#include "16/src/lib/bitmap.h"\r
+//----#include "src/lib/planar.h"\r
 \r
-global_game_variables_t gvar;\r
+static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
 /*\r
 void\r
@@ -55,8 +55,9 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
 */\r
 \r
 void main() {\r
+       static global_game_variables_t gvar;\r
        bitmap_t bmp;\r
-       planar_buf_t *p;\r
+//---- planar_buf_t *p;\r
        int i;\r
        word start;\r
        int plane;\r
@@ -84,17 +85,18 @@ void main() {
        }\r
 \r
 //0000 bmp = bitmapLoadPcx("data/koishi~~.pcx");\r
-       bmp = bitmapLoadPcx("data/chikyuu.pcx");\r
+//0000 bmp = bitmapLoadPcx("data/chikyuu.pcx"/*, &gvar*/);\r
+       bmp = bitmapLoadPcx("data/maryai.pcx"/*, &gvar*/);\r
 //     bmp = bitmapLoadPcx("data/koishi^^.pcx");\r
 //     bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");\r
-       p = planar_buf_from_bitmap(&bmp);\r
+//---- p = planar_buf_from_bitmap(&bmp);\r
        VGAmodeX(1, 1, &gvar);\r
-       gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
+       //--00  gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
        gvar.video.page[0].sw+=32;\r
        gvar.video.page[0].sh+=32;\r
 \r
        /* fix up the palette and everything */\r
-       modexPalUpdate1(bmp.palette);\r
+       modexPalUpdate(bmp.palette);\r
 \r
        /* clear and draw one sprite and one bitmap */\r
        modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 1);\r