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 a234f82cf8f66fa49d1057244aa661141c14cf8d..e10362037e827acf43e675ea3719928b1a6538e0 100644 (file)
Binary files a/data/g.pal and b/data/g.pal differ

diff --git a/makefile b/makefile
index 3037233f8732314acbd246a15db485cf54f6bf65..824ef94f45c1f73122febfbf29ab964ca84b8087 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-FLAGS=-0 -d2 \r
+FLAGS=-0 -d2 -mh \r
 SRC=src\\r
 SRCLIB=$(SRC)lib\\r
 all: test.exe pcxtest.exe test2.exe scroll.exe\r
@@ -9,22 +9,22 @@ scroll.obj: $(SRC)scroll.c
        wcl $(FLAGS) -c $(SRC)scroll.c\r
 test.exe: test.obj modex16.obj bitmap.obj\r
        wcl $(FLAGS) test.obj modex16.obj bitmap.obj\r
-       \r
+\r
 test2.exe: test2.obj modex16.obj bitmap.obj planar.obj\r
        wcl $(FLAGS) test2.obj modex16.obj bitmap.obj planar.obj\r
-       \r
+\r
 pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj\r
        wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj\r
 \r
-#maptest.exe: maptest.obj mapread.obj jsmn.obj\r
-#        wcl $(FLAGS) maptest.obj jsmn.obj\r
+maptest.exe: maptest.obj mapread.obj jsmn.obj\r
+       wcl $(FLAGS) maptest.obj jsmn.obj\r
 \r
 test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test.c\r
-       \r
+\r
 test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test2.c\r
-       \r
+\r
 pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)pcxtest.c\r
 \r
@@ -42,7 +42,7 @@ bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
 \r
 planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c\r
        wcl $(FLAGS) -c $(SRCLIB)planar.c\r
-       \r
+\r
 mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c jsmn.obj lib_head.obj\r
        wcl $(FLAGS) -c $(SRCLIB)mapread.c\r
 \r
@@ -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\r
        wcl $(FLAGS) -c $(SRCLIB)jsmn\jsmn.c\r
 \r
-clean: \r
+clean:\r
        del *.obj\r
 #      del *.exe\r

diff --git a/mapread.exe b/mapread.exe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/pcxtest.exe b/pcxtest.exe
index 988abb27a635cd535d95140add2a049c76e0b124..478916cf1dab43d4ec348019bd2531dd96da751f 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 43c383fea0ad4937d7ceda9c7d136a499fa15165..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
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 5933a249dca00ccdefe60b8fd46ffe53236a2208..32fdeb67b8bc1027f7675418e239e38e5d869171 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -122,8 +122,9 @@ void main() {
        }*/\r
 \r
        /* create the map */\r
-//0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());\r
-       loadmap("data/test.map", &map);\r
+//0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
+       fprintf(stderr, "testing~\n");\r
+//testqqqq     loadmap("data/test.map", &map);\r
 //---- 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\r
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());\r
 //---- initMap(&map);\r

diff --git a/test.exe b/test.exe
index 736b224abfb858bbd8602848b2ae3913d20a821b..6f9f78a9d3e89fba6c8aa8122c3d76a53626bf38 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index da9ec199b70bc63a261140f707d6490eff8ac7eb..efd5d134e3af979812002741ff0a77fb020ba5c1 100644 (file)
Binary files a/test2.exe and b/test2.exe differ