From: sparky4 <sparky4@cock.li>
Date: Tue, 2 Jun 2015 17:28:26 +0000 (-0500)
Subject: fixing scroll wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=eb5c226c9efd7efea9e6b73da2528ebac6f1a840;p=16.git

fixing scroll wwww
	modified:   data/g.pal
	modified:   scroll.exe
	modified:   src/scroll.c
---

diff --git a/data/g.pal b/data/g.pal
index a234f82c..2ef9eed0 100644
Binary files a/data/g.pal and b/data/g.pal differ
diff --git a/scroll.exe b/scroll.exe
index a0f20084..98ca00f7 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/scroll.c b/src/scroll.c
index 8279a20e..0b5fc6b1 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -4,6 +4,8 @@
 #include "src/lib/wtest/wtest.c"
 #include "src/lib/planar.c"
 //====#include "src\lib\ems.c"
+
+//#define LOADDATA
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
 
@@ -124,9 +126,11 @@ void main() {
 
 	/* create the map */
 //0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
-//0000	fprintf(stderr, "testing~\n");
+	fprintf(stderr, "testing~\n");
+//#ifdef LOADDATA
 	loadmap("data/test.map", &map);
-//0000	fprintf(stderr, "yay map loaded~~\n");
+//#endif
+	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);
@@ -138,13 +142,17 @@ void main() {
 	ptr = map.data;
 	mappalptr = map.tiles->data->palette;
 	/* data */
-//0000	printf("Total used @ before image loading:		%zu\n", oldfreemem-GetFreeSize());
-	ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+//0000	printf("Total used @ before image loading:		%zu\n", oldfreemem-GetFreeSize());
+#ifdef LOADDATA
+	ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+#endif
 	//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);
+//0000	printf("Total used @ before planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
+#ifdef LOADDATA
+	p = planar_buf_from_bitmap(&ptmp);
+#endif
 //0000	printf("Total used @ after planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
 
 	/*if(isEMS())