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

[16.git] / src / 16.c

diff --git a/src/16.c b/src/16.c
index d2072fcb1c640eb485325e2654563f150948d768..a96b1c495de738a594f791d6041a335277a664c4 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -23,8 +23,6 @@
 #include "src/16.h"\r
 \r
 engi_stat_t engi_stat;\r
-byte *dpal, *gpal;\r
-player_t player[MaxPlayers];\r
 \r
 void\r
 main(int argc, char *argv[])\r
@@ -35,19 +33,17 @@ main(int argc, char *argv[])
        engi_stat = ENGI_RUN;\r
 \r
        /* save the palette */\r
-       dpal = modexNewPal();\r
-       modexPalSave(dpal);\r
-       modexFadeOff(4, dpal);\r
-       gpal = modexNewPal();\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
+       modexPalSave(gvar.video.dpal);\r
+       modexFadeOff(4, gvar.video.dpal);\r
+       modexPalSave(gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", gvar.video.palette);\r
        VGAmodeX(1, 1, &gvar);\r
 //     modexPalBlack();        //so player will not see loadings~\r
-       IN_Default(0,&player,ctrl_Joystick);\r
+       IN_Default(0,&gvar.player[0],ctrl_Joystick);\r
        //modexprint(&screen, 32, 32, 1, 2, 0, "a", 1);\r
        while(ENGI_EXIT != engi_stat)\r
        {\r
-               IN_ReadControl(0,&player);\r
+               IN_ReadControl(&gvar.player[0]);\r
                if(IN_KeyDown(sc_Escape)) engi_stat = ENGI_EXIT;\r
                shinku(&gvar);\r
                _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);\r
@@ -57,5 +53,5 @@ main(int argc, char *argv[])
        printf("Project 16 16.exe. This is supposed to be the actual finished game executable!\n");\r
        printf("version %s\n", VERSION);\r
        WCPU_cpufpumesg();\r
-       modexFadeOn(4, dpal);\r
+       modexFadeOn(4, gvar.video.dpal);\r
 }\r