From: sparky4 <sparky4@cock.li>
Date: Fri, 5 Jun 2015 17:34:11 +0000 (-0500)
Subject: hmmm scroll.exe is seriously broken... wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=111b6cfe076d6333ada6787e2b81c0d836d0818a;p=16.git

hmmm scroll.exe is seriously broken... wwww
	modified:   data/g.pal
	modified:   scroll.exe
	modified:   src/scroll.c
---

diff --git a/data/g.pal b/data/g.pal
index 9ce11752..f977ba22 100644
Binary files a/data/g.pal and b/data/g.pal differ
diff --git a/scroll.exe b/scroll.exe
index a72bd9b5..fd7110f9 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/scroll.c b/src/scroll.c
index 72ad4d5c..b2b1f98f 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -106,9 +106,9 @@ void main() {
 
 	/* create the map */
 //0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
-//0000	fprintf(stderr, "testing~\n");
-	loadmap("data/test.map", &map);
-//0000	fprintf(stderr, "yay map loaded~~\n");
+	fprintf(stderr, "testing~\n");
+//++++	loadmap("data/test.map", &map);
+	fprintf(stderr, "yay map loaded~~\n");
 //----	map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
 	//if(isEMS()) printf("%d tesuto\n", coretotalEMS());
 //----	initMap(&map);
@@ -121,12 +121,12 @@ void main() {
 	mappalptr = map.tiles->data->palette;
 	/* data */
 //0000	printf("Total used @ before image loading:		%zu\n", oldfreemem-GetFreeSize());
-	//++++ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+	ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
 	//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
 
 	/* create the planar buffer */
 //0000	printf("Total used @ before planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
-//++++	p = planar_buf_from_bitmap(&ptmp);
+	p = planar_buf_from_bitmap(&ptmp);
 //0000	printf("Total used @ after planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
 
 	/*if(isEMS())