From: sparky4 <sparky4@cock.li>
Date: Sat, 23 May 2015 22:41:17 +0000 (-0500)
Subject: cleaning
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=d8a7059beb93623a3e104c4b46a183d73e443d01;p=16.git

cleaning
	modified:   data/g.pal
	modified:   makefile
	new file:   mapread.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	renamed:    src/lib/PLANAR.C -> src/lib/PLANAR.C0
	modified:   src/scroll.c
	modified:   test.exe
	modified:   test2.exe
---

diff --git a/data/g.pal b/data/g.pal
index a234f82c..e1036203 100644
Binary files a/data/g.pal and b/data/g.pal differ
diff --git a/makefile b/makefile
index 3037233f..824ef94f 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-FLAGS=-0 -d2 
+FLAGS=-0 -d2 -mh 
 SRC=src\
 SRCLIB=$(SRC)lib\
 all: test.exe pcxtest.exe test2.exe scroll.exe
@@ -9,22 +9,22 @@ scroll.obj: $(SRC)scroll.c
 	wcl $(FLAGS) -c $(SRC)scroll.c
 test.exe: test.obj modex16.obj bitmap.obj
 	wcl $(FLAGS) test.obj modex16.obj bitmap.obj
-	
+
 test2.exe: test2.obj modex16.obj bitmap.obj planar.obj
 	wcl $(FLAGS) test2.obj modex16.obj bitmap.obj planar.obj
-	
+
 pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj
 	wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj
 
-#maptest.exe: maptest.obj mapread.obj jsmn.obj
-#        wcl $(FLAGS) maptest.obj jsmn.obj
+maptest.exe: maptest.obj mapread.obj jsmn.obj
+	wcl $(FLAGS) maptest.obj jsmn.obj
 
 test.obj: $(SRC)test.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)test.c
-	
+
 test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)test2.c
-	
+
 pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)pcxtest.c
 
@@ -42,7 +42,7 @@ bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
 
 planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c
 	wcl $(FLAGS) -c $(SRCLIB)planar.c
-	
+
 mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c jsmn.obj lib_head.obj
 	wcl $(FLAGS) -c $(SRCLIB)mapread.c
 
@@ -52,6 +52,6 @@ lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
 jsmn.obj: $(SRCLIB)jsmn\jsmn.h $(SRCLIB)jsmn\jsmn.c
 	wcl $(FLAGS) -c $(SRCLIB)jsmn\jsmn.c
 
-clean: 
+clean:
 	del *.obj
 #	del *.exe
diff --git a/mapread.exe b/mapread.exe
new file mode 100644
index 00000000..e69de29b
diff --git a/pcxtest.exe b/pcxtest.exe
index 988abb27..478916cf 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 43c383fe..e69de29b 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/PLANAR.C b/src/lib/PLANAR.C0
similarity index 100%
rename from src/lib/PLANAR.C
rename to src/lib/PLANAR.C0
diff --git a/src/scroll.c b/src/scroll.c
index 5933a249..32fdeb67 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -122,8 +122,9 @@ void main() {
 	}*/
 
 	/* create the map */
-//0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
-	loadmap("data/test.map", &map);
+//0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
+	fprintf(stderr, "testing~\n");
+//testqqqq	loadmap("data/test.map", &map);
 //----	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);
diff --git a/test.exe b/test.exe
index 736b224a..6f9f78a9 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index da9ec199..efd5d134 100644
Binary files a/test2.exe and b/test2.exe differ