From: sparky4 <sparky4@cock.li>
Date: Mon, 31 Oct 2016 16:10:32 +0000 (-0500)
Subject: wwww what wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=f4c6f3f670e78f2d160fcf10f954155797ef67ef;p=16.git

wwww what wwww
---

diff --git a/.makefile.kate-swp b/.makefile.kate-swp
new file mode 100755
index 00000000..d00c921e
Binary files /dev/null and b/.makefile.kate-swp differ
diff --git a/makefile b/makefile
index 4582df3c..7eacf644 100755
--- 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 c3d66e2c..24ded39c 100755
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "16_map.h"
+#include "src/lib/16_map.h"
 
 // Ideally, preprocess json during compilation and read serialized data
 
diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 0642d2b4..bf87c875 100755
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef _LIBMAPREAD_H_
-#define _LIBMAPREAD_H_
+#ifndef _16_MAP__H_
+#define _16_MAP__H_
 
-#include "jsmn/jsmn.h"
+#include "src/lib/jsmn/jsmn.h"
 //#include "stdio.h" included in 16_head.h
 //#include "stdlib.h" included in 16_head.h
 #include "src/lib/16_vl.h"
diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 2c75c4eb..534f5c23 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -29,6 +29,7 @@
 #include "src/lib/16_in.h"
 #include "src/lib/bitmap.h"
 #include "src/lib/mapread.h" //map is loaded here www
+//#include "src/lib/16_map.h"	//new map stuff
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 #include "src/lib/16_tail.h"
diff --git a/src/scroll.c b/src/scroll.c
index e638df1b..86d2ff04 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -23,6 +23,7 @@
 #include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
+#include "src/lib/mapread.h"
 
 //#define FADE
 #define MODEX	//this is for mode x initiating
@@ -56,7 +57,7 @@ boolean panswitch=0;
 
 void main(int argc, char *argv[])
 {
-	byte *mesg=malloc(sizeof(dword));
+	//byte *mesg=malloc(sizeof(dword));
 
 	if(argv[1]) bakapee = atoi(argv[1]);
 	else bakapee = 1;
diff --git a/src/zcroll.c b/src/zcroll.c
index 31623367..caa94c23 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -53,8 +53,6 @@ boolean panswitch=0,baka=0;
 
 void main(int argc, char *argv[])
 {
-	byte *mesg=malloc(sizeof(dword));
-
 	if(argv[1]) bakapee = atoi(argv[1]);
 	else bakapee = 1;