==== PRE SHOWPAGE TO SHOWMV CONVERSION ==== i am going to work on a really big area...

[16.git] / src / test.c

diff --git a/src/test.c b/src/test.c
index 28e537ab2fcaf102f613e03929e7b8eaecc565a0..a38f4b7ec94b92e0cf084d58e8c8ada10747575b 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -26,14 +26,20 @@
 #include "src/lib/scroll16.h"\r
 #include "src/lib/bakapee.h"\r
 \r
+#define PCXBMPVAR              player[0].data\r
+#define PCXBMP                 *PCXBMPVAR\r
+#define PCXBMPPTR              PCXBMPVAR\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
@@ -41,7 +47,7 @@ void main(int argc, char *argv[])
        sword bakapee;\r
 \r
        //====word colo=LGQ;\r
-       pan.pn=0;\r
+       gvar.video.panp=0;\r
 \r
        //argument\r
        if(argv[1]) bakapee = atoi(argv[1]);\r
@@ -76,6 +82,7 @@ void main(int argc, char *argv[])
        _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log\r
        _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);*/\r
        Startup16(&gvar);\r
+       PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
 \r
        /* save the palette */\r
        //====pal  = modexNewPal();\r
@@ -98,14 +105,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
@@ -138,7 +138,7 @@ void main(int argc, char *argv[])
        {\r
                IN_ReadControl(0,&player);\r
                ZC_panPageManual(&mv, &player, 0);\r
-               //[pan.pn]\r
+               //[gvar.video.panp]\r
                //ZC_MVSync(&mv);\r
 \r
                /*if(i<5){\r
@@ -147,23 +147,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.panp].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.panp].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.panp].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.panp].dy--;\r
                                if(j>=32){ k=0; j=0; i++; }else j++;\r
                        break;\r
                        default:\r
@@ -197,8 +197,8 @@ 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.panp]); IN_UserInput(1,1); }//p\r
+               //VL_ShowPage(&gvar.video.page[gvar.video.panp], 0, 0);\r
                ZC_ShowMV(&mv, 0, 0);\r
        }\r
 \r
@@ -212,7 +212,7 @@ void main(int argc, char *argv[])
        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
+       printf("tx=%d   ", mv[gvar.video.panp].tx); printf("ty=%d       ", mv[gvar.video.panp].ty); printf("player.d=%d\n", player[0].d);\r
        //IN_Shutdown();\r
        //====modexPalBlack();\r
        //====modexFadeOn(1, pal);\r