got pcxtest.exe to compile and work

[16.git] / src / pcxtest.c

diff --git a/src/pcxtest.c b/src/pcxtest.c
index 357e2cae3451f75c2f2d8c4e182c22019bc20dde..1c3aa9c925fd40c086521136492fa549a3957129 100755 (executable)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -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
@@ -24,21 +24,20 @@
 #include <dos.h>\r
 #include <string.h>\r
 #include "src/lib/16_vl.h"\r
-#include "src/lib/bitmap.h"\r
-#include "src/lib/16render.h"\r
+//#include "16/modex16/bitmap.h"\r
+//#include "16/modex16/16render.h"\r
 #include "src/lib/16_in.h"\r
 \r
 #include "src/lib/16_tail.h"\r
 \r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
-#define PCXBMPVAR              player[0].data\r
+#define PCXBMPVAR              gvar.player[0].data\r
 #define PCXBMP                 *PCXBMPVAR\r
 #define PCXBMPPTR              PCXBMPVAR\r
 \r
 void main() {\r
        static global_game_variables_t gvar;\r
-       static player_t player[MaxPlayers];\r
 //---- planar_buf_t *p;\r
        word start;\r
        float t1, t2;\r
@@ -65,16 +64,17 @@ void main() {
        }\r
 \r
 //0000 PCXBMP = bitmapLoadPcx("data/koishi~~.pcx");\r
-       PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar);\r
+//0000 PCXBMP = bitmapLoadPcx("data/chikyuu.pcx"/*, &gvar*/);\r
+       PCXBMP = bitmapLoadPcx("data/maryai.pcx");\r
 //     PCXBMP = bitmapLoadPcx("data/koishi^^.pcx");\r
 //     PCXBMP = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");\r
 //---- p = planar_buf_from_bitmap(PCXBMPPTR);\r
 \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
 \r
        /* fix up the palette and everything */\r
-       modexPalUpdate1(&PCXBMP->palette);\r
+       modexPalUpdate(&PCXBMP->palette);\r
 \r
        /* clear and draw one sprite and one bitmap */\r
        modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 1);\r