From: sparky4 <sparky4@cock.li>
Date: Wed, 1 Apr 2015 06:14:17 +0000 (-0500)
Subject: added easter egg and palette updater stress test.... apparently ther eis a bug....
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=21feb71f40d3cf99f39bb8758a609b2a1cbd6d0c;p=16.git

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 6817b366..c473ce56 100644
Binary files a/data/g.pal and b/data/g.pal differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 4da808b5..488f4366 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 9a2f597d..48d9d53b 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 82ce2c1d..bcf98c11 100644
--- 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 e4821f2b..9a615c59 100644
--- 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--; }
 	//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() {
 	}
 
 	/* fade back to text mode */
+	/* but 1st lets save the game palette~ */
+	modexPalSave(gpal);
+	modexSavePalFile("data/g.pal", gpal);
 	modexFadeOff(4, gpal);
 	modexLeave();
 	setkb(0);
diff --git a/test.exe b/test.exe
index f466b3d1..b20a2ed2 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index 96c4bbe0..68e9c919 100644
Binary files a/test2.exe and b/test2.exe differ