oh shit!!!

	renamed:    EMSTEST.EXE -> limems_0.exe
	modified:   makefile
	deleted:    mapread.exe
	new file:   maptest.exe
	modified:   scroll.exe
	modified:   src/lib/bitmap.h
	modified:   src/lib/mapread.c
	modified:   src/lib/mapread.h
	modified:   src/lib/modex16.h
	modified:   src/maptest.c
	modified:   src/palettec.c
	modified:   src/pcxtest.c
	modified:   src/test.c
	modified:   src/test2.c

diff --git a/EMSTEST.EXE b/limems_0.exe
similarity index 100%
rename from EMSTEST.EXE
rename to limems_0.exe

diff --git a/makefile b/makefile
index 09ad5ba87201f0e17a99a845cd6350e61aeb4dad..433caf816f858cc4bde11f7f7c3ab5e65b1048bd 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-FLAGS=-0 -d2 -mh \r
+FLAGS=-0 -d2 \r
 SRC=src\\r
 SRCLIB=$(SRC)lib\\r
 all: test.exe pcxtest.exe test2.exe scroll.exe\r
@@ -16,8 +16,9 @@ test2.exe: test2.obj modex16.obj bitmap.obj planar.obj
 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 modex16.obj bitmap.obj\r
+       wcl $(FLAGS) maptest.obj jsmn.obj modex16.obj bitmap.obj\r
+\r
 \r
 test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test.c\r

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

diff --git a/maptest.exe b/maptest.exe
new file mode 100644 (file)
index 0000000..ec5c972
Binary files /dev/null and b/maptest.exe differ

diff --git a/scroll.exe b/scroll.exe
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..38e708591f48bf751f25823254147ea861942ec4 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 17bb0d94ae189de14e921d60f83792bb2849ba22..19ae2f04ebdae05f0d9e20a1cb5bf4d961ad53e9 100644 (file)
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -3,7 +3,7 @@
  */\r
 #ifndef BITMAP_H\r
 #define BITMAP_H
-#include <malloc.h>\r
+//#include <malloc.h>\r
 #include "src/lib/types.h"\r
 typedef struct {\r
     byte *data;

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 8f84071a6cf11411ae4b0a95ac2d96c54db34aee..73fefcd0c0bb850984a5443f2bb19776631aafe6 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -26,7 +26,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 
                                FUCK well i am stuck.... wwww
                        */
-                       map->data[q] = (byte)strtol(js+t->start, (char **)t->end, 10);
+//++++                 map->data[q] = (byte)strtol(js+t->start, (char **)t->end, 10);
 //                     printf("%d[%d]", q, map->data[q]);
                }
                else
@@ -112,7 +112,7 @@ static int loadmap(char *mn, map_t *map)
 
        /* Prepare parser */
        jsmn_init(&p);
-
+fprintf(stderr, "b4 malloc\n");
        /* Allocate some tokens as a start */
        tok = malloc(sizeof(*tok) * tokcount);
        if (tok == NULL) {
@@ -161,6 +161,7 @@ again:
                        eof_expected = 1;
                }
        }
+fprintf(stderr, "a4 malloc\n");
 
        free(js);
        free(tok);

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index 8b1b3e0a6f1af32d625a609a1354f678cbfa72cd..1ce7b01ef98de4552ce9a3243683be752d62ed5d 100644 (file)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -2,6 +2,9 @@
 #define _LIBMAPREAD_H_
 #include <string.h>
 #include <errno.h>
+
+//#include <stdlib.h>
+
 #include "src/lib/jsmn/jsmn.h"
 #include "src/lib/modex16.h"
 #include "src/lib/lib_head.h"

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 2a4987a5e20dd8d66b3d93e0eb78d51d689fa2c6..fa9e54e05799e564cf4c00c98a453486804a8399 100644 (file)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -4,9 +4,9 @@
 #ifndef MODEX16_H
 #define MODEX16_H
 #include <conio.h>
-#include "src\lib\types.h"
-#include "src\lib\bitmap.h"
-#include "src\lib\planar.h"
+#include "src/lib/types.h"
+#include "src/lib/bitmap.h"
+#include "src/lib/planar.h"
 
 /* -========================== Types & Macros ==========================- */
 #define PAGE_OFFSET(x,y) (((y)<<6)+((y)<<4)+((x)>>2))

diff --git a/src/maptest.c b/src/maptest.c
index e25c9818eaab635dddc187cd23c9b0183eb2ad4f..ae016eec046c4e47eb02e1977595168d8d3a6a1a 100644 (file)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -1,8 +1,10 @@
 #include "src/lib/mapread.c"\r
 \r
-int main()\r
+void
+main(int argc, char *argv[])\r
 {\r
-       map_t map;\r
-       loadmap("data/test.map", &map);\r
-       return 0;\r
+       map_t map;
+       fprintf(stderr, "wwww\n");\r
+       //loadmap("data/test.map", &map);
+       fprintf(stderr, "wwww\n");\r
 }\r

diff --git a/src/palettec.c b/src/palettec.c
index 630d7b35400339ad374b1936707d9b5880a1ab11..09b259450676ebd1f7002764f44c4a18d7b5353a 100644 (file)
--- a/src/palettec.c
+++ b/src/palettec.c
@@ -1,16 +1,16 @@
-#include "src\lib\modex16.h"\r
+#include "src/lib/modex16.h"\r
 \r
 void\r
 main() {\r
-    byte *pal;\r
+       byte *pal;\r
 \r
-    modexEnter();\r
+       modexEnter();\r
 \r
-    pal = modexNewPal();\r
-    modexPalSave(pal);\r
+       pal = modexNewPal();\r
+       modexPalSave(pal);\r
 \r
-    modexSavePalFile("gfx.pal", pal);\r
+       modexSavePalFile("gfx.pal", pal);\r
 \r
-    modexLeave();\r
+       modexLeave();\r
 \r
 }\r

diff --git a/src/pcxtest.c b/src/pcxtest.c
index f735a5597e2561044f64406e85cd453c41e314cd..60cc85e26c17761392e9ebbe5716a8fcd26e7b0f 100644 (file)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <dos.h>
 #include <string.h>\r
-#include "src\lib\modex16.h"\r
-#include "src\lib\bitmap.h"
-#include "src\lib\planar.c"\r
+#include "src/lib/modex16.h"\r
+#include "src/lib/bitmap.h"
+#include "src/lib/planar.c"\r
 \r
 word far* clock= (word far*) 0x046C; /* 18.2hz clock */\r
 \r

diff --git a/src/test.c b/src/test.c
index fd2ec3f9f1dc4b7481f86ddba0925032beb148b7..24520a53b41addd3c26bf02ac35b884abc8e0e82 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -1,4 +1,4 @@
-#include "src\lib\modex16.h"\r
+#include "src/lib/modex16.h"\r
 #include <stdio.h>\r
 \r
 word far* clock= (word far*) 0x046C; /* 18.2hz clock */\r

diff --git a/src/test2.c b/src/test2.c
index 48299a41f2d80655d7df21108242e3367f68ef70..8926372d1e6275277d2dfee568996951c775f7e4 100644 (file)
--- a/src/test2.c
+++ b/src/test2.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <conio.h>
-#include "src\lib\modex16.h"\r
-#include "src\lib\planar.h"\r
-#include "src\lib\bitmap.h"\r
+#include "src/lib/modex16.h"\r
+#include "src/lib/planar.h"\r
+#include "src/lib/bitmap.h"\r
 \r
 word far* clock= (word far*) 0x046C; /* 18.2hz clock */\r
 \r