Merge branch 'master' of github.com:sparky4/16

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index c5688601206d47326c575b63346d159c9df2b020..ed2341bb37e629d758bcafe5ab8e1227c3009c97 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -82,7 +82,7 @@ void main(int argc, char *argv[])
 \r
        // create the map\r
 //     fprintf(stderr, "testing map load~      ");\r
-       loadmap("data/test.map", &map);\r
+       CA_loadmap("data/test.map", &map, &gvar);\r
        chkmap(&map, 0);\r
 //     initMap(&map);\r
 //     printf("chkmap ok       ");\r
@@ -103,12 +103,14 @@ void main(int argc, char *argv[])
 \r
        VGAmodeX(1/*bakapee*/, 1, &gvar);\r
 \r
-       /* fix up the palette and everything */\r
-#ifdef FADE\r
-       modexPalBlack();        //reset the palette~\r
-#endif\r
-\r
        /* load color palette */\r
+       /*ptmp.offset=(paloffset/3);\r
+       modexPalUpdate(&ptmp, &paloffset, 0, 0);\r
+       //modexClearRegion(bg->page, 0, 0, 320, 240, 255);\r
+       //printf("      %d\n", sizeof(ptmp.data));\r
+       //printf("1:    %d\n", paloffset);\r
+       map.tiles->data->offset=(paloffset/3);\r
+       modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/\r
        VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
 \r
 #ifdef FADE\r