added easter egg and palette updater stress test.... apparently ther eis a bug....

	modified:   data/g.pal
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   src/lib/modex16.c
	modified:   src/scroll.c
	modified:   test.exe
	modified:   test2.exe

diff --git a/data/g.pal b/data/g.pal
index 6817b3660eaa0b447b4d44657fe8457b62dfa9ca..c473ce56c12d6a039032e192053b837cb404f505 100644 (file)
Binary files a/data/g.pal and b/data/g.pal differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 4da808b5f21c9ce334c73846c72a6ec7270aaca4..488f43662e0696016efef07dce89df87c445f3eb 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 9a2f597de53ef8fbba1037e633499eff9f83ae5b..48d9d53bdb50db183a08e8b4e9c180df5256f39d 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 82ce2c1d55aab26386103d2a8d1e28923d183b8c..bcf98c1187adff0119947cd3a992eece926cdae8 100644 (file)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -593,7 +593,7 @@ modexPalWhite() {
 void
 modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp)
 {
-       byte *p = bmp->palette;
+       const byte *p = bmp->palette;
        word w=0;
        word q=0;
        word qq=0;

diff --git a/src/scroll.c b/src/scroll.c
index e4821f2b9571d272e07b36d694378af4f67a630c..9a615c598bfb580a919e7b7d92f1a6d6db495eb9 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -543,7 +543,8 @@ void main() {
        if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }\r
        //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }
        if(keyp(25)){ pdump(bg); pdump(spri); }
-       if(keyp(24)){ modexPalUpdate3(gpal); pdump(bg); pdump(spri); modexPalSave(gpal); modexSavePalFile("data/g.pal", gpal); }
+       if(keyp(24)){ modexPalUpdate3(gpal); paloffset=0; pdump(bg); pdump(spri); }
+       if(keyp(22)){ paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0); modexPalUpdate(map.tiles->data, &paloffset, 0, 0); pdump(bg); pdump(spri); }
 
        if(keyp(87))
        {
@@ -558,6 +559,9 @@ void main() {
        }\r
 \r
        /* fade back to text mode */
+       /* but 1st lets save the game palette~ */
+       modexPalSave(gpal);
+       modexSavePalFile("data/g.pal", gpal);
        modexFadeOff(4, gpal);\r
        modexLeave();\r
        setkb(0);\r

diff --git a/test.exe b/test.exe
index f466b3d1f061ab90b63581130935cdb7a591454c..b20a2ed2a6c716f7ffe67849ab516fe89e8b0909 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 96c4bbe083b727f236a0670eb7e71778b49675e2..68e9c9198b88eed087bfe361fe2affe811f838f4 100644 (file)
Binary files a/test2.exe and b/test2.exe differ