paltest nolonger stack overflows

diff --git a/src/lib/16_vlpal.c b/src/lib/16_vlpal.c
index 57a97f0a70e35071cd170571e381bed3d8cea0a0..a6af26188012e9fd2121dc3ec4d92dc4afe8e22e 100755 (executable)
--- a/src/lib/16_vlpal.c
+++ b/src/lib/16_vlpal.c
@@ -92,14 +92,17 @@ no... wait.... no wwww
                //free(pal);\r
 }\r
 \r
+//what is *i, w, q, qq, z, aq, aa, pp, qp, and aqoffset...\r
+//pp is related to i\r
+\r
 void\r
-VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset, global_game_variables_t *gv)\r
+VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset, word *apal, global_game_variables_t *gv)\r
 {\r
        //byte *p = bmp->palette;\r
        word w=0;\r
        word q=0;\r
        word qq=0;\r
-       static word a[PAL_SIZE];        //palette array of change values!\r
+       word a[PAL_SIZE];       //palette array of change values!\r
        word z=0, aq=0, aa=0, pp=0;\r
 \r
        //modexWaitBorder();\r
@@ -253,7 +256,7 @@ printf("              aq=%02d\n", aq);//
 printf("                 aa=%02d\n", aa);//\r
 #endif\r
        //update the palette~\r
-       VL_palette(bmp, p, &pp, aq, aqoffset, gv);\r
+       VL_palette(bmp, p, &pp, aq, aqoffset, &a, gv);\r
        (*i)=pp;\r
 \r
        if(aq<aa){ pp=q; aq++; goto aqpee; }\r

diff --git a/src/lib/16_vlpal.h b/src/lib/16_vlpal.h
index aa6e1c3d6a8ed0f7961760ee61543a5f2019f5f2..4184b057910e40c79485a0a7348b558f3e60efcc 100755 (executable)
--- a/src/lib/16_vlpal.h
+++ b/src/lib/16_vlpal.h
@@ -14,7 +14,7 @@ typedef struct
 } imgtestpal_t;\r
 \r
 void VL_modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp, global_game_variables_t *gv);\r
-void VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset, global_game_variables_t *gv);\r
+void VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset, word *apal, global_game_variables_t *gv);\r
 \r
 \r
 #endif //__16_VLPAL_H__\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 2b7b2ed6b38382723b80be134cb5d22284de2eb4..6d2fa67ac4b68bc93ad2533fcc7baeb115197511 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 2b7b2ed6b38382723b80be134cb5d22284de2eb4
+Subproject commit 6d2fa67ac4b68bc93ad2533fcc7baeb115197511

diff --git a/src/paltest.c b/src/paltest.c
index b353468ebc6ec5795ed389cb5c39f2b30beae511..f79ea35f6666e44c361c8947d1801b5135b640d2 100755 (executable)
--- a/src/paltest.c
+++ b/src/paltest.c
@@ -78,13 +78,13 @@ void main(int argc, char *argv[])
        VL_LoadPalFile("data/16.pal", &gvar.video.palette, &gvar);\r
 #ifndef DONOTPALCHECK\r
        bmp1.offset=(paloffset/3);\r
-//     VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0, &gvar);\r
+       VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0, NULL, &gvar);\r
 \r
        //VL_LoadPalFilewithoffset("data/default.pal", &palette, paloffset);\r
        modexLoadPalFile("data/16t.pal", &gvar.video.dpal);\r
        //VLL_LoadPalFilewithoffset("data/16t.pal", &gvar.video.palette, paloffset, 8, &gvar);\r
        bmp2.offset=(paloffset/3);\r
-//     VL_palette(&bmp2, &gvar.video.dpal, &paloffset, 0, 0, &gvar);\r
+       VL_palette(&bmp2, &gvar.video.dpal, &paloffset, 0, 0, NULL, &gvar);\r
        //====modexLoadPalFile("data/default.pal", &pal2);\r
 #endif\r
        VL_PaletteSync(&gvar);\r