From: sparky4 <sparky4@cock.li>
Date: Thu, 20 Apr 2017 16:58:32 +0000 (-0500)
Subject: p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I... 
X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=856e2f26da3f862e9db2ee66074e0c88554ac3d2

p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I should remember what needs to be done soon][OpenVGMFile needs to be ported to 16_snd.c]going to port rest of code to borland c some time so we can use the core components of id engine here [going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] MM_ShowMemory works how i want wwww [0croll.exe works better now]
---

diff --git a/src/lib/16render.c b/16/src/lib/16render.c
similarity index 95%
rename from src/lib/16render.c
rename to 16/src/lib/16render.c
index 0b4a0497..03933e0c 100755
--- a/src/lib/16render.c
+++ b/16/src/lib/16render.c
@@ -23,7 +23,7 @@
  * Render data code~
  */
 
-#include "src/lib/16render.h"
+#include "16/src/lib/16render.h"
 
 //TODO! ADD CLIPPING!!
 //memory management needs to be added
@@ -289,7 +289,7 @@ void
 modexDrawBmpPBufRegion(page_t *page, int x, int y,
 		   int rx, int ry, int rw, int rh, planar_buf_t *bmp) {
 	word poffset = (word) page->data  + y*(page->width/4) + x/4;
-	byte *data = bmp->plane[0];
+	byte *data = (byte *)bmp->plane[0];
 	word bmpOffset = (word) data + ry * bmp->width + rx;
 	word width = rw;
 	word height = rh;
@@ -367,7 +367,7 @@ void
 modexDrawSpritePBufRegion(page_t *page, int x, int y,
 		      int rx, int ry, int rw, int rh, planar_buf_t *bmp) {
 	word poffset = (word)page->data + y*(page->width/4) + x/4;
-	byte *data = bmp->plane[0];
+	byte *data = (byte *)bmp->plane[0];
 	word bmpOffset = (word) data + ry * bmp->width + rx;
 	word width = rw;
 	word height = rh;
diff --git a/src/lib/16render.h b/16/src/lib/16render.h
similarity index 96%
rename from src/lib/16render.h
rename to 16/src/lib/16render.h
index bea992be..57c8d4fd 100755
--- a/src/lib/16render.h
+++ b/16/src/lib/16render.h
@@ -23,7 +23,6 @@
 #ifndef __RENDER_H__
 #define __RENDER_H__
 
-//#include "src/lib/16_vl.h"
 #include "16/src/lib/omodex16.h"
 
 void modexDrawPBufRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite);
diff --git a/makefile b/makefile
index 75fc0af8..542a5db0 100755
--- a/makefile
+++ b/makefile
@@ -157,7 +157,7 @@ DOSLIB=doslib.lib
 #
 #	Files locations
 #
-.c : $(SRC);$(SRCLIB);$(MODEXLIB16);$(JSMNLIB);$(NYANLIB);$(VGMSNDLIB);$(WCPULIB);$(UTIL);16/$(SRCLIB)
+.c : $(SRC);$(SRCLIB);$(MODEXLIB16);$(JSMNLIB);$(NYANLIB);$(VGMSNDLIB);$(WCPULIB);$(UTIL)
 
 .asm : $(MODEXLIB);$(UTIL)
 
@@ -256,8 +256,6 @@ bakapi.exe:		bakapi.$(OBJ) 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16text.$(OBJ) bakapee.$(O
 #
 # Test Executables!
 #
-0croll.exe:	0croll.$(OBJ) $(OLDLIBOBJS) omodex16.$(OBJ) 16_in.$(OBJ)
-0croll.$(OBJ):	$(SRC)/0croll.c
 scroll.exe:	scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 scroll.$(OBJ):	$(SRC)/scroll.c
 xcroll.exe:	xcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
@@ -299,21 +297,21 @@ wcpu.exe:		wcpu.$(OBJ) $(16LIB) $(DOSLIB)
 #
 # executable's objects
 #
-16.$(OBJ):		$(SRC)/16.c $(SRC)/16.h
-bakapi.$(OBJ):	$(SRC)/bakapi.c $(SRC)/bakapi.h
-vidtest.$(OBJ):	$(SRC)/vidtest.c $(SRCLIB)/16_vl.h
-#test2.$(OBJ):	$(SRC)/test2.c $(SRCLIB)/16_vl.h
+16.$(OBJ):		$(SRC)/16.c	$(SRC)/16.h
+bakapi.$(OBJ):	$(SRC)/bakapi.c	$(SRC)/bakapi.h
+vidtest.$(OBJ):	$(SRC)/vidtest.c	$(SRCLIB)/16_vl.h
+#test2.$(OBJ):	$(SRC)/test2.c	$(SRCLIB)/16_vl.h
 test0.$(OBJ):	 $(SRC)/test0.c
-pcxtest.$(OBJ):$(SRC)/pcxtest.c $(SRCLIB)/16_vl.h
-vrstest.$(OBJ):$(SRC)/vrstest.c $(SRCLIB)/16_vl.h
-#vgacamm.$(OBJ):$(SRC)/vgacamm.c $(SRCLIB)/16_vl.h
-#planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/16_vl.h
-pcxtest2.$(OBJ):$(SRC)/pcxtest2.c $(SRCLIB)/16_vl.h
+pcxtest.$(OBJ):$(SRC)/pcxtest.c	$(SRCLIB)/16_vl.h
+vrstest.$(OBJ):$(SRC)/vrstest.c	$(SRCLIB)/16_vl.h
+#vgacamm.$(OBJ):$(SRC)/vgacamm.c	$(SRCLIB)/16_vl.h
+#planrpcx.$(OBJ): $(SRC)/planrpcx.c	$(SRCLIB)/16_vl.h
+pcxtest2.$(OBJ):$(SRC)/pcxtest2.c	$(SRCLIB)/16_vl.h
 palettec.$(OBJ):	$(SRC)/palettec.c
 palettel.$(OBJ):	$(SRC)/palettel.c
 palbomb.$(OBJ):	$(SRC)/palbomb.c
 palllist.$(OBJ):	$(SRC)/palllist.c
-maptest.$(OBJ):$(SRC)/maptest.c $(SRCLIB)/16_vl.h
+maptest.$(OBJ):$(SRC)/maptest.c	$(SRCLIB)/16_vl.h
 #emmtest.$(OBJ):$(SRC)/emmtest.c
 #emsdump.$(OBJ):$(SRC)/emsdump.c
 fmemtest.$(OBJ):$(SRC)/fmemtest.c
@@ -376,47 +374,59 @@ opltest.exe:
 	cd $(DOSLIB_ADLIB:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
 	$(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)test.exe opltest.exe
 
-16_vl.$(OBJ):	$(SRCLIB)/16_vl.c $(SRCLIB)/16_vl.h
-16_vl_1.$(OBJ):	$(SRCLIB)/16_vl_1.c $(SRCLIB)/16_vl.h
-16_vlpal.$(OBJ):	$(SRCLIB)/16_vlpa_.c	$(SRCLIB)/16_vlpal.c $(SRCLIB)/16_vlpal.h
-bakapee.$(OBJ):	$(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
-16render.$(OBJ):$(SRCLIB)/16render.c $(SRCLIB)/16render.h
-16planar.$(OBJ):$(MODEXLIB16)/16planar.c $(MODEXLIB16)/16planar.h
-16_vrs.$(OBJ):	$(SRCLIB)/16_vrs.c $(SRCLIB)/16_vrs.h $(DOSLIB)
-16_spri.$(OBJ):$(SRCLIB)/16_spri.c $(SRCLIB)/16_spri.h
-bitmap.$(OBJ):	16/$(SRCLIB)/bitmap.c 16/$(SRCLIB)/bitmap.h
-omodex16.$(OBJ):	16/$(SRCLIB)/omodex16.c 16/$(SRCLIB)/omodex16.h
-planar.$(OBJ):	$(SRCLIB)/planar.c $(SRCLIB)/planar.h
-scroll16.$(OBJ):$(SRCLIB)/scroll16.c $(SRCLIB)/scroll16.h
-16text.$(OBJ):	$(SRCLIB)/16text.c $(SRCLIB)/16text.h
-16_enti.$(OBJ):	$(SRCLIB)/16_enti.c $(SRCLIB)/16_enti.h
-mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
-16_map.$(OBJ):$(SRCLIB)/16_map.c $(SRCLIB)/16_map.h
-16_timer.$(OBJ):$(SRCLIB)/16_timer.c $(SRCLIB)/16_timer.h
-16_in.$(OBJ):	 $(SRCLIB)/16_in.c $(SRCLIB)/16_in.h
-#16_in_1.$(OBJ):	 $(SRCLIB)/16_in_1.c $(SRCLIB)/16_in_1.h
-16_rf.$(OBJ):	 $(SRCLIB)/16_rf.c	$(SRCLIB)/16_rf.h
-16_mm.$(OBJ):	 $(SRCLIB)/16_mm.c	$(SRCLIB)/16_mm.h
-16_pm.$(OBJ):	 $(SRCLIB)/16_pm.c	$(SRCLIB)/16_pm.h
-16_ca.$(OBJ):	 $(SRCLIB)/16_ca.c	$(SRCLIB)/16_ca.h
-16_us.$(OBJ):	 $(SRCLIB)/16_us.c
-16_dbg.$(OBJ):	$(SRCLIB)/16_dbg.c $(SRCLIB)/16_dbg.h
-16_dbg_1.$(OBJ):	$(SRCLIB)/16_dbg_1.c $(SRCLIB)/16_dbg.h
-midi.$(OBJ):	$(SRCLIB)/midi.c $(SRCLIB)/midi.h
-16_head.$(OBJ):$(SRCLIB)/16_head.c $(SRCLIB)/16_head.h
-16_tail.$(OBJ):$(SRCLIB)/16_tail.c $(SRCLIB)/16_tail.h
-16_tail_.$(OBJ):$(SRCLIB)/16_tail_.c $(SRCLIB)/16_tail.h
-16_hc.$(OBJ):	 $(SRCLIB)/16_hc.c $(SRCLIB)/16_hc.h
-16_sd.$(OBJ):	$(SRCLIB)/16_sd.c $(SRCLIB)/16_sd.h
-jsmn.$(OBJ):	$(JSMNLIB)/jsmn.c $(JSMNLIB)/jsmn.h
-kitten.$(OBJ):	$(NYANLIB)/kitten.c $(NYANLIB)/kitten.h
-vgmSnd.$(OBJ):	$(VGMSNDLIB)/vgmSnd.c $(VGMSNDLIB)/vgmSnd.h
-16_wcpu.$(OBJ):	$(WCPULIB)/16_wcpu.c $(WCPULIB)/16_wcpu.h
-#memory.$(OBJ):$(EXMMLIB)/memory.c $(EXMMLIB)/memory.h
-c_utils.$(OBJ):$(MODEXLIB)/c_utils.asm
-modex.$(OBJ):	 $(MODEXLIB)/modex.asm
+16_vl.$(OBJ):	$(SRCLIB)/16_vl.c	$(SRCLIB)/16_vl.h
+16_vl_1.$(OBJ):	$(SRCLIB)/16_vl_1.c	$(SRCLIB)/16_vl.h
+16_vlpal.$(OBJ):	$(SRCLIB)/16_vlpa_.c	$(SRCLIB)/16_vlpal.c	$(SRCLIB)/16_vlpal.h
+bakapee.$(OBJ):	$(SRCLIB)/bakapee.c	$(SRCLIB)/bakapee.h
+16planar.$(OBJ):	$(MODEXLIB16)/16planar.c $(MODEXLIB16)/16planar.h
+16_vrs.$(OBJ):	$(SRCLIB)/16_vrs.c	$(SRCLIB)/16_vrs.h $(DOSLIB)
+16_spri.$(OBJ):	$(SRCLIB)/16_spri.c	$(SRCLIB)/16_spri.h
+planar.$(OBJ):	$(SRCLIB)/planar.c	$(SRCLIB)/planar.h
+scroll16.$(OBJ):	$(SRCLIB)/scroll16.c	$(SRCLIB)/scroll16.h
+16text.$(OBJ):	$(SRCLIB)/16text.c	$(SRCLIB)/16text.h
+16_enti.$(OBJ):	$(SRCLIB)/16_enti.c	$(SRCLIB)/16_enti.h
+mapread.$(OBJ):	$(SRCLIB)/mapread.c	$(SRCLIB)/mapread.h
+16_map.$(OBJ):	$(SRCLIB)/16_map.c	$(SRCLIB)/16_map.h
+16_timer.$(OBJ):	$(SRCLIB)/16_timer.c	$(SRCLIB)/16_timer.h
+16_in.$(OBJ):	$(SRCLIB)/16_in.c	$(SRCLIB)/16_in.h
+16_mm.$(OBJ):	$(SRCLIB)/16_mm.c	$(SRCLIB)/16_mm.h
+16_pm.$(OBJ):	$(SRCLIB)/16_pm.c	$(SRCLIB)/16_pm.h
+16_ca.$(OBJ):	$(SRCLIB)/16_ca.c	$(SRCLIB)/16_ca.h
+16_rf.$(OBJ):	$(SRCLIB)/16_rf.c
+16_us.$(OBJ):	$(SRCLIB)/16_us.c
+16_dbg.$(OBJ):	$(SRCLIB)/16_dbg.c	$(SRCLIB)/16_dbg.h
+16_dbg_1.$(OBJ):	$(SRCLIB)/16_dbg_1.c	$(SRCLIB)/16_dbg.h
+16_head.$(OBJ):	$(SRCLIB)/16_head.c	$(SRCLIB)/16_head.h
+16_tail.$(OBJ):	$(SRCLIB)/16_tail.c	$(SRCLIB)/16_tail.h
+16_tail_.$(OBJ):	$(SRCLIB)/16_tail_.c	$(SRCLIB)/16_tail.h
+16_hc.$(OBJ):	$(SRCLIB)/16_hc.c	$(SRCLIB)/16_hc.h
+16_sd.$(OBJ):	$(SRCLIB)/16_sd.c	$(SRCLIB)/16_sd.h
+jsmn.$(OBJ):	$(JSMNLIB)/jsmn.c	$(JSMNLIB)/jsmn.h
+kitten.$(OBJ):	$(NYANLIB)/kitten.c	$(NYANLIB)/kitten.h
+vgmSnd.$(OBJ):	$(VGMSNDLIB)/vgmSnd.c	$(VGMSNDLIB)/vgmSnd.h
+16_wcpu.$(OBJ):	$(WCPULIB)/16_wcpu.c	$(WCPULIB)/16_wcpu.h
+#memory.$(OBJ):	$(EXMMLIB)/memory.c	$(EXMMLIB)/memory.h
+midi.$(OBJ):	$(SRCLIB)/midi.c
+c_utils.$(OBJ):	$(MODEXLIB)/c_utils.asm
+modex.$(OBJ):	$(MODEXLIB)/modex.asm
 ll.$(OBJ):		$(SRCLIB)/ll.c	$(SRCLIB)/ll.h
 
+#
+# old 16 lib
+#
+0croll.exe:	0croll.$(OBJ) $(OLDLIBOBJS) omodex16.$(OBJ) 16_ino.$(OBJ)
+	wcl -0 $(WCLQ) 0croll.$(OBJ) omodex16.$(OBJ) bitmap.$(OBJ) 16_ino.$(OBJ)
+0croll.$(OBJ):	$(SRC)/0croll.c
+	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c src/0croll.c
+16render.$(OBJ):	16/$(SRCLIB)/16render.c	16/$(SRCLIB)/16render.h
+	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/16render.c
+bitmap.$(OBJ):	16/$(SRCLIB)/bitmap.c	16/$(SRCLIB)/bitmap.h
+	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/bitmap.c
+omodex16.$(OBJ):	16/$(SRCLIB)/omodex16.c	16/$(SRCLIB)/omodex16.h
+	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/omodex16.c
+16_ino.$(OBJ):	$(SRCLIB)/16_in.c	$(SRCLIB)/16_in.h
+	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=16_ino.$(OBJ) -c src/lib/16_in.c
+
 #
 #other~
 #
diff --git a/src/0croll.c b/src/0croll.c
index 151a0bf4..3a91e173 100755
--- a/src/0croll.c
+++ b/src/0croll.c
@@ -105,7 +105,7 @@ void main() {
 	//TODO: top left corner & bottem right corner of map veiw be set as map edge trigger since omapS are actually square
 	//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
 	//when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map
-	while(gvar.in.inst->Keyboard[77]){
+	if(gvar.in.inst->Keyboard[77]){
 //		for(q=0; q<TILEWH; q++) {
 		omapScrollRight(draw, 1);
 //		omodexShowPage(draw->page);
@@ -114,7 +114,7 @@ void main() {
 //		}
 	}
 
-	while(gvar.in.inst->Keyboard[75]){
+	if(gvar.in.inst->Keyboard[75]){
 //		for(q=0; q<TILEWH; q++) {
  		omapScrollLeft(draw, 1);
 //		omodexShowPage(draw->page);
@@ -123,7 +123,7 @@ void main() {
 //		}
 	}
 
-	while(gvar.in.inst->Keyboard[80]){
+	if(gvar.in.inst->Keyboard[80]){
 //		for(q=0; q<TILEWH; q++) {
 		omapScrollDown(draw, 1);
 //		omodexShowPage(draw->page);
@@ -132,7 +132,7 @@ void main() {
 //		}
 	}
 
-	while(gvar.in.inst->Keyboard[72]){
+	if(gvar.in.inst->Keyboard[72]){
 //		for(q=0; q<TILEWH; q++) {
 		omapScrollUp(draw, 1);
 //		omodexShowPage(draw->page);
diff --git a/src/lib/doslib b/src/lib/doslib
index 45e96424..09127331 160000
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 45e9642437301420932de3c8ebdd4a920ead57ce
+Subproject commit 09127331598605db26f49461ba6faa90455b171a
diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 2eb1b838..6a36737c 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -29,8 +29,7 @@
 #include "src/lib/16_vl.h"
 #include "src/lib/16_in.h"
 #include "src/lib/16_map.h" //map is loaded here www
-#include "src/lib/16render.h"
-//#include "src/lib/16_map.h"	//new map stuff
+//#include "src/lib/16render.h"
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/16_wcpu.h"
 #include "src/lib/16_spri.h"
diff --git a/src/pcxtest.c b/src/pcxtest.c
index 047fb7a5..ba696902 100755
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include "src/lib/16_vl.h"
 #include "src/lib/bitmap.h"
-#include "src/lib/16render.h"
+#include "16/src/lib/16render.h"
 #include "src/lib/16_in.h"
 
 #include "src/lib/16_tail.h"
diff --git a/src/xcroll.c b/src/xcroll.c
index d32cb9d7..ed02457e 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,7 +22,6 @@
 
 #include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
-#include "src/lib/16render.h"
 #include "src/lib/16_dbg.h"
 
 #define FADE