wwww what wwww

diff --git a/.makefile.kate-swp b/.makefile.kate-swp
new file mode 100755 (executable)
index 0000000..d00c921
Binary files /dev/null and b/.makefile.kate-swp differ

diff --git a/makefile b/makefile
index 4582df3cc76dcea7fde2869b39826741bca61c00..7eacf6445264dd77387c9e14b3f574d320a8447d 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -108,7 +108,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ)
 OLDGFXLIBOBJS=bitmap.$(OBJ)
-16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) wcpu.$(OBJ) 16_timer.$(OBJ)
+16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) wcpu.$(OBJ) 16_timer.$(OBJ) 16_map.$(OBJ) jsmn.$(OBJ)
 #16planar.$(OBJ) planar.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
@@ -187,15 +187,15 @@ testexec: $(EXEC) joytest.exe $(TESTEXEC2)
 #
 # game and bakapi executables
 #
-16.exe:           16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+16.exe:           16.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
 bakapi.exe:       bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS)
 
 #
 # Test Executables!
 #
-scroll.exe:       scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) $(OLDGFXLIBOBJS)
+scroll.exe:       scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) $(OLDGFXLIBOBJS)
 scroll.$(OBJ):    $(SRC)/scroll.c
-zcroll.exe:       zcroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+zcroll.exe:       zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
 zcroll.$(OBJ):    $(SRC)/zcroll.c
 tesuto.exe:       tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIBLIBS)
 tesuto.$(OBJ):    $(SRC)/tesuto.c
@@ -216,7 +216,7 @@ palettec.exe:     palettec.$(OBJ) gfx.lib $(DOSLIBLIBS)
 palettel.exe:     palettel.$(OBJ) gfx.lib $(DOSLIBLIBS)
 pcxtest2.exe:     pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS) $(OLDGFXLIBOBJS)
 #planrpcx.exe:    planrpcx.$(OBJ) gfx.lib
-maptest.exe:      maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) jsmn.$(OBJ) gfx.lib $(DOSLIBLIBS)
+maptest.exe:      maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIBLIBS)
 fmemtest.exe:     fmemtest.$(OBJ)
 exmmtest.exe:     exmmtest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
 vgmtest.exe:      vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIBLIBS)

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index c3d66e2c6e2ef80573244884cb7cc8ee38333e86..24ded39cbb8a0b1e8bdc4f7e7cf57f1292d8fdb6 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -20,7 +20,7 @@
  *\r
  */\r
 \r
-#include "16_map.h"\r
+#include "src/lib/16_map.h"\r
 \r
 // Ideally, preprocess json during compilation and read serialized data\r
 \r

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 0642d2b4f2a1a2392959535e8fc92ead4b164496..bf87c8753c0aa1c14192698beaa715c14bbf3ba3 100755 (executable)
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -20,10 +20,10 @@
  *\r
  */\r
 \r
-#ifndef _LIBMAPREAD_H_\r
-#define _LIBMAPREAD_H_\r
+#ifndef _16_MAP__H_\r
+#define _16_MAP__H_\r
 \r
-#include "jsmn/jsmn.h"\r
+#include "src/lib/jsmn/jsmn.h"\r
 //#include "stdio.h" included in 16_head.h\r
 //#include "stdlib.h" included in 16_head.h\r
 #include "src/lib/16_vl.h"\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 2c75c4eb0f81fadd95665d53ec6211a77f8837b0..534f5c23bf3da3cd29b082954ae4b522c39a6a5a 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -29,6 +29,7 @@
 #include "src/lib/16_in.h"\r
 #include "src/lib/bitmap.h"\r
 #include "src/lib/mapread.h" //map is loaded here www\r
+//#include "src/lib/16_map.h"  //new map stuff\r
 #include "src/lib/16_timer.h"\r
 #include "src/lib/wcpu/wcpu.h"\r
 #include "src/lib/16_tail.h"\r

diff --git a/src/scroll.c b/src/scroll.c
index e638df1b06c0677b09dce6d45fe3b32e956024a8..86d2ff04c8b140310a4b395e0e216730b9a3239f 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -23,6 +23,7 @@
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
 #include "src/lib/wcpu/wcpu.h"\r
+#include "src/lib/mapread.h"\r
 \r
 //#define FADE\r
 #define MODEX  //this is for mode x initiating\r
@@ -56,7 +57,7 @@ boolean panswitch=0;
 \r
 void main(int argc, char *argv[])\r
 {\r
-       byte *mesg=malloc(sizeof(dword));\r
+       //byte *mesg=malloc(sizeof(dword));\r
 \r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r

diff --git a/src/zcroll.c b/src/zcroll.c
index 3162336759841b37722be8febc8497033898c6a3..caa94c234eac46cf49ee4aedcd2e44a4fa3cbd71 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -53,8 +53,6 @@ boolean panswitch=0,baka=0;
 \r
 void main(int argc, char *argv[])\r
 {\r
-       byte *mesg=malloc(sizeof(dword));\r
-\r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r