Merge remote-tracking branch 'upstream/master'

[16.git] / src / palettel.c

diff --git a/src/palettel.c b/src/palettel.c
index 92f1f31b4c71a6cfe623d68d23aaa61fa28c250c..7ed33b843e1593c8f27c0775b82eb16384f78727 100755 (executable)
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -27,12 +27,10 @@ global_game_variables_t gvar;
 byte *pal;\r
 char *bakapee;\r
 word i;\r
-page_t page;\r
 \r
 void\r
 main(int argc, char *argv[])\r
 {\r
-       page = modexDefaultPage();\r
        //page.width += 32;\r
        //page.height += 32;\r
        pal = modexNewPal();\r
@@ -41,12 +39,13 @@ main(int argc, char *argv[])
        else bakapee = "data/default.pal";\r
 //     modexPalSave(pal);\r
        VGAmodeX(1, &gvar);\r
+       gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);\r
        modexPalBlack();\r
 \r
        modexLoadPalFile(bakapee, &pal);\r
        modexPalUpdate1(pal);\r
        modexFadeOn(1, pal);\r
-       pdump(&page);\r
+       pdump(&gvar.video.page[0]);\r
        getch();\r
        modexLeave();//VGAmodeX(0, &gvar);\r
        modexPalUpdate1(pal);\r