showing row and colum drawing i optimized it to only draw at the end of walk. this...

[16.git] / src / test.c

diff --git a/src/test.c b/src/test.c
index 6339d96d17f0644a98486e017c743b6fdafc712c..9bdd8a6ffe834b2ac8cf7c11111e68a42f191517 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -24,28 +24,26 @@
 #include "src/lib/16_vl.h"\r
 #include "src/lib/16_in.h"\r
 #include "src/lib/scroll16.h"\r
-#include "src/lib/bakapee.h"\r
+\r
+#define LGQ 32\r
+#define HGQ 55\r
 \r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
-player_t player[MaxPlayers];\r
-pan_t pan;\r
 \r
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
+       static player_t player[MaxPlayers];\r
+\r
+       map_t map;\r
        map_view_t mv[4];\r
+\r
        int i, j;\r
        word startclk, endclk;\r
        word k;\r
        //====byte *pal, *pal2;\r
-       sword bakapee;\r
 \r
        //====word colo=LGQ;\r
-       pan.pn=0;\r
-\r
-       //argument\r
-       if(argv[1]) bakapee = atoi(argv[1]);\r
-       else bakapee = 1;\r
 \r
        // DOSLIB: check our environment\r
        /*probe_dos();\r
@@ -85,9 +83,9 @@ void main(int argc, char *argv[])
 \r
        //IN_Startup();\r
        IN_Default(0,&player,ctrl_Keyboard1);\r
-       IN_initplayer(&player, 0);\r
+       EN_initplayer(&player, 0);\r
 \r
-       VGAmodeX(bakapee, 1, &gvar);\r
+       VGAmodeX(1, 1, &gvar);\r
        //====modexPalBlack();\r
 \r
        /* load our palette */\r
@@ -98,14 +96,7 @@ void main(int argc, char *argv[])
 \r
        /* set up the page, but with 16 pixels on all borders in offscreen mem */\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       for(i=0;i<gvar.video.num_of_pages;i++)\r
-       {\r
-               mv[i].page = &gvar.video.page[i];\r
-               mv[i].video = &gvar.video;\r
-               mv[i].pan       = &pan;\r
-               mv[i].tx        = 1;\r
-               mv[i].ty        = 1;\r
-       }\r
+       ZC_MVSetup(&mv, &map, &gvar);\r
 \r
        /* fill the page with one color, but with a black border */\r
        /*modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 15);\r
@@ -137,7 +128,8 @@ void main(int argc, char *argv[])
        while(!IN_KeyDown(sc_Escape))\r
        {\r
                IN_ReadControl(0,&player);\r
-               ZC_panPageManual(&mv[pan.pn], &player, 0);\r
+               ZC_panPageManual(&mv, &player, 0);\r
+               //[gvar.video.p]\r
                //ZC_MVSync(&mv);\r
 \r
                /*if(i<5){\r
@@ -146,23 +138,23 @@ void main(int argc, char *argv[])
                        case 0:\r
                                pee:\r
                                // go right\r
-                               gvar.video.page[pan.pn].dx++;\r
+                               gvar.video.page[gvar.video.p].dx++;\r
                                if(i==5){ if(j>=31){ i++; j=0; goto baka; }else j++; }else\r
                                if(j>=32){ k++; j=0; }else j++;\r
                        break;\r
                        case 1:\r
                                // go left\r
-                               gvar.video.page[pan.pn].dx--;\r
+                               gvar.video.page[gvar.video.p].dx--;\r
                                if(j>=32){ k++; j=0; }else j++;\r
                        break;\r
                        case 2:\r
                                // go up\r
-                               gvar.video.page[pan.pn].dy++;\r
+                               gvar.video.page[gvar.video.p].dy++;\r
                                if(j>=32){ k++; j=0; }else j++;\r
                        break;\r
                        case 3:\r
                                // go down\r
-                               gvar.video.page[pan.pn].dy--;\r
+                               gvar.video.page[gvar.video.p].dy--;\r
                                if(j>=32){ k=0; j=0; i++; }else j++;\r
                        break;\r
                        default:\r
@@ -183,10 +175,7 @@ void main(int argc, char *argv[])
 //                             modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);\r
 //                     }\r
                //}\r
-               if(IN_KeyDown(1+1)){ pan.pn=0; }\r
-               if(IN_KeyDown(2+1)){ pan.pn=1; }\r
-               if(IN_KeyDown(3+1)){ pan.pn=2; }\r
-               if(IN_KeyDown(4+1)){ pan.pn=3; }\r
+               PANKEYFUN;\r
                if(IN_KeyDown(12)) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);\r
                if(IN_KeyDown(13)) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);\r
 /*====         if(IN_KeyDown(7)){\r
@@ -199,8 +188,9 @@ void main(int argc, char *argv[])
                        }\r
 //                     if(i>PAL_SIZE) i=0;\r
                }//9*/\r
-               if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[pan.pn]); IN_UserInput(1,1); }//p\r
-               VL_ShowPage(&gvar.video.page[pan.pn], 0, 0);\r
+               if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.p]); IN_UserInput(1,1); }//p\r
+               //VL_ShowPage(&gvar.video.page[gvar.video.p], 0, 0);\r
+               ZC_ShowMV(&mv, 0, 0);\r
        }\r
 \r
        endclk = *clockw;\r
@@ -212,8 +202,8 @@ void main(int argc, char *argv[])
        Shutdown16(&gvar);\r
        printf("Project 16 test.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
-       modexprintmeminfo(&gvar.video);\r
-       printf("tx=%d   ", mv[pan.pn].tx); printf("ty=%d        ", mv[pan.pn].ty); printf("player.d=%d\n", player[0].d);\r
+       VL_PrintmodexmemInfo(&gvar.video);\r
+       printf("tx=%d   ", mv[gvar.video.p].tx); printf("ty=%d  ", mv[gvar.video.p].ty); printf("player.d=%d\n", player[0].enti.d);\r
        //IN_Shutdown();\r
        //====modexPalBlack();\r
        //====modexFadeOn(1, pal);\r