updated the copyleft wwww i am not deAD! i just been 2 busy last 6 monthes

[16.git] / src / pcxtest.c

diff --git a/src/pcxtest.c b/src/pcxtest.c
index 29183665112acc02b629e4c3381e74cb4a8c21ca..52ebb1a5875a0c9494f7ca4869d17a5b279500e9 100755 (executable)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -25,20 +25,19 @@
 #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/src/lib/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
@@ -74,15 +73,15 @@ void main() {
        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].sw, gvar.video.page[0].sh, 1);\r
+       modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 1);\r
 \r
        /* non sprite comparison */\r
-       start = *clockw;\r
+       /*start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
-               oldDrawBmp(VGA, 20, 20, PCXBMPPTR, 0);\r
+               oldDrawBmp(VGA, 0, 0, PCXBMPPTR, 0);\r
        //}\r
 \r
        start = *clockw;\r
@@ -97,20 +96,23 @@ void main() {
 //0000         modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 20, 20, 128, 20, 64, 64);\r
                modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);\r
        //}\r
-       t2 = (*clockw-start)/18.2;\r
+       t2 = (*clockw-start)/18.2;*/\r
 \r
 \r
        start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
-               oldDrawBmp(VGA, 20, 20, PCXBMPPTR, 1);\r
+               oldDrawBmp(VGA, 0, 0, PCXBMPPTR, 1);\r
        //}\r
+       t1 = (*clockw-start) /18.2;\r
 \r
 \r
        start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
 //0000         modexDrawSprite(&gvar.video.page[0], 20, 20, PCXBMPPTR);\r
-               modexDrawSprite(&gvar.video.page[0], 160, 120, PCXBMPPTR);\r
+               modexDrawSprite(&(gvar.video.page[0]), 160, 120, PCXBMPPTR);\r
+               modexDrawBmp(&gvar.video.page[0], 0, 128, PCXBMPPTR);\r
        //}\r
+       t2 = (*clockw-start)/18.2;\r
        //_fmemset(MK_FP(0xA000, 0), (int)p->plane, gvar.video.page[0].sw*(gvar.video.page[0].sh*2));\r
        //modexDrawBmp(&gvar.video.page[0], 0, 0, PCXBMPPTR);\r
        while(!kbhit())\r