__seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd...

[16.git] / src / test.c

diff --git a/src/test.c b/src/test.c
index 839915fca95c245e818eb6384a30b9f67841ee24..37116b283d6b80178503ccadcc7311255c7673a4 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -22,6 +22,7 @@
 \r
 #include <stdio.h>\r
 #include "src/lib/16_vl.h"\r
+#include "src/lib/16_vlpal.h"\r
 #include "src/lib/16_in.h"\r
 #include "src/lib/scroll16.h"\r
 \r
@@ -32,8 +33,8 @@ static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 \r
 void main(int argc, char *argv[])\r
 {\r
+       static word paloffset=0;\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
@@ -41,7 +42,12 @@ void main(int argc, char *argv[])
        int i, j;\r
        word startclk, endclk;\r
        word k;\r
-       //====byte *pal, *pal2;\r
+\r
+       imgtestpal_t bmp1, bmp2;\r
+\r
+\r
+       bmp1.width=bmp2.width=  40;\r
+       bmp1.width=bmp2.height= 30;\r
 \r
        //====word colo=LGQ;\r
 \r
@@ -76,19 +82,26 @@ void main(int argc, char *argv[])
        Startup16(&gvar);\r
 \r
        /* save the palette */\r
-       //====pal  = modexNewPal();\r
        //====modexPalSave(pal);\r
        //====modexFadeOff(1, pal);\r
        //====modexPalBlack();\r
 \r
        //IN_Startup();\r
-       IN_Default(0,&player,ctrl_Keyboard1);\r
-       EN_initplayer(&player, 0, &gvar.video);\r
+       IN_Default(0,&gvar.player[0],ctrl_Keyboard1);\r
+       EN_initPlayer(&gvar.player, 0, &gvar.video);\r
 \r
        VGAmodeX(1, 1, &gvar);\r
-       //====modexPalBlack();\r
+       modexPalBlack();\r
 \r
        /* load our palette */\r
+       VL_LoadPalFile("data/16.pal", &gvar.video.palette);\r
+       bmp1.offset=(paloffset/3);\r
+       VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0, &gvar);\r
+\r
+       //VL_LoadPalFilewithoffset("data/default.pal", &palette, paloffset);\r
+       modexLoadPalFile("data/16t.pal", &gvar.video.dpal);\r
+       bmp2.offset=(paloffset/3);\r
+       VL_palette(&bmp2, &gvar.video.dpal, &paloffset, 0, 0, &gvar);\r
        //====modexLoadPalFile("data/default.pal", &pal2);\r
 \r
        /* overscan show */\r
@@ -111,13 +124,13 @@ void main(int argc, char *argv[])
        modexShowPage(&gvar.video.page[0]);*/\r
 \r
 \r
-       modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15);\r
-       modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128);\r
-       modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42);\r
-       modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128);\r
+       modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 1);\r
+       modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 2);\r
+       modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 3);\r
+       modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 2);\r
        modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width, gvar.video.page[0].height);\r
-       modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 47);\r
-       modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 45);\r
+       modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 4);\r
+       modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 6);\r
 \r
 \r
        /* fade in */\r
@@ -127,8 +140,8 @@ void main(int argc, char *argv[])
        startclk = *clockw;\r
        while(!IN_KeyDown(sc_Escape))\r
        {\r
-               IN_ReadControl(0,&player);\r
-               ZC_panPageManual(&mv, &player, 0);\r
+               IN_ReadControl(&gvar.player[0]);\r
+               ZC_panPageManual(&mv, &gvar.player, 0);\r
                //[gvar.video.sp]\r
                //ZC_MVSync(&mv);\r
 \r
@@ -175,20 +188,20 @@ 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
-               PANKEYFUN;\r
+               TAIL_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
                        for(i=0;i<3;i++)\r
                        {\r
                                pal2[i] = rand()%64;\r
-                               modexPalUpdate1(pal2);\r
+                               modexPalUpdate(pal2);\r
                                colo++;\r
                                if(colo>HGQ) colo=LGQ;\r
                        }\r
 //                     if(i>PAL_SIZE) i=0;\r
                }//9*/\r
-               if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1,1); }//p\r
+               if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1); }//p\r
                //VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);\r
                ZC_ShowMV(&mv, 0, 0);\r
        }\r
@@ -203,7 +216,10 @@ 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
        VL_PrintmodexmemInfo(&gvar.video);\r
-       printf("tx=%d   ", mv[gvar.video.sp].tx); printf("ty=%d ", mv[gvar.video.sp].ty); printf("player.d=%d\n", player[0].enti.d);\r
+       printf("tx=%d   ", mv[gvar.video.sp].tx); printf("ty=%d ", mv[gvar.video.sp].ty); printf("gvar.player.d=%d\n", gvar.player[0].enti.d);\r
+       printf("\n====\n");\r
+       printf("0       paloffset=      %d\n", paloffset/3);\r
+       printf("====\n\n");\r
        //IN_Shutdown();\r
        //====modexPalBlack();\r
        //====modexFadeOn(1, pal);\r