__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 6d130170cf2a3743401cd5eeba4456e626b96cf4..37116b283d6b80178503ccadcc7311255c7673a4 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -30,13 +30,11 @@
 #define HGQ 55\r
 \r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
-static byte *palette;//[PAL_SIZE];\r
 \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
@@ -84,14 +82,13 @@ void main(int argc, char *argv[])
        Startup16(&gvar);\r
 \r
        /* save the palette */\r
-       palette = 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
@@ -99,12 +96,12 @@ void main(int argc, char *argv[])
        /* 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);\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", &palette);\r
+       modexLoadPalFile("data/16t.pal", &gvar.video.dpal);\r
        bmp2.offset=(paloffset/3);\r
-       VL_palette(&bmp2, palette, &paloffset, 0, 0);\r
+       VL_palette(&bmp2, &gvar.video.dpal, &paloffset, 0, 0, &gvar);\r
        //====modexLoadPalFile("data/default.pal", &pal2);\r
 \r
        /* overscan show */\r
@@ -143,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
@@ -191,7 +188,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
-               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
@@ -204,7 +201,7 @@ void main(int argc, char *argv[])
                        }\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
@@ -219,7 +216,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
        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