Merge remote-tracking branch 'upstream/master'

[16.git] / src / palettel.c

diff --git a/src/palettel.c b/src/palettel.c
index 15a8111f008722844042a2c051edd81122cd2a18..a40bd3fd7a8f5cc2f205011fa5b6c442aa9208d8 100755 (executable)
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -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,16 +39,18 @@ 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
-       VGAmodeX(0, &gvar);\r
-       for(i=0;i<768;i++)\r
+       modexLeave();//VGAmodeX(0, &gvar);\r
+       modexPalUpdate1(pal);\r
+       /*for(i=0;i<768;i++)\r
        {\r
                printf("%02X ", pal[i]);\r
-       }\r
+       }*/\r
 }\r