p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[16.git] / src / palettel.c

diff --git a/src/palettel.c b/src/palettel.c
index e7f2ace0fc3323edfe92fe0d46a260252e2f0a93..9249e540d96f7efbe501ea33bb267f31720a8b2b 100755 (executable)
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -23,32 +23,29 @@
 #include "src/lib/16_vl.h"\r
 #include "src/lib/bakapee.h"\r
 \r
-byte *pal;\r
-char *bakapee;\r
 word i;\r
 \r
-void\r
-main(int argc, char *argv[])\r
+void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       //page.width += 32;\r
-       //page.height += 32;\r
-       pal = modexNewPal();\r
-       bakapee = malloc(64);\r
-       if(argv[1]) bakapee = argv[1];\r
-       else bakapee = "data/default.pal";\r
-//     modexPalSave(pal);\r
+       char bakapee[64] = "data\default.pal";\r
+\r
+       if(argv[1]) strcpy(bakapee, argv[1]);\r
+\r
+\r
+       modexPalSave(&(gvar.video.palette));\r
+       VL_modexPalScramble(&(gvar.video.palette));\r
        VGAmodeX(1, 1, &gvar);\r
        gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);\r
        modexPalBlack();\r
 \r
-       modexLoadPalFile(bakapee, &pal);\r
-       modexPalUpdate(pal);\r
-       modexFadeOn(1, pal);\r
+       modexLoadPalFile(bakapee, &(gvar.video.palette));\r
+       modexPalUpdate(&(gvar.video.palette));\r
+       modexFadeOn(1, &(gvar.video.palette));\r
        modexpdump(&gvar.video.page[0]);\r
-       getch();\r
+//     getch();\r
        VGAmodeX(0, 0, &gvar);\r
-       modexPalUpdate(pal);\r
+       modexPalUpdate(&(gvar.video.palette));\r
        /*for(i=0;i<768;i++)\r
        {\r
                printf("%02X ", pal[i]);\r