Merge remote-tracking branch 'upstream/master'

diff --combined .gitignore
index 61aa5c76ea68220b1a1e6c6276876c39da186b2f,107b0e0163209538a99ca649fe9682b8d0b41242..3f07a93e29988a610ab2e0b3f256252d0e61ab02
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -19,6 -19,7 +19,7 @@@ TODO
  LICENCE~\r
  *.mah\r
  *.MAH\r
+ !makefile\r
  !modex.lib\r
  img\r
  !.git/config\r
@@@ -27,8 -28,4 +28,8 @@@
  #!foo.html\r
  # Ignore objects and archives.\r
  *.[oa]\r
 -\r
 +cute.vrl\r
 +cute.pal\r
 +dl_vga.lib\r
 +dl_cpu.lib\r
 +dl_dos.lib\r

diff --combined makefile
index ee23f2f2b259485d174bfedc98c6c2c93ba9e4d9,d6cc76f9cb9fe4497a1303c1308f585e0c11b71a..a9583f13e8fc45703e059aa98e454a1224a56250
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -26,6 -26,12 +26,12 @@@
  # -zk0        kanji support~
  # -zkl                current codepage
  
+ # this enables debug output to the serial port.
+ # comment this out on game release.
+ # serial output goes to COM1 at 9600 baud 1 stop bit odd parity.
+ # serial output is plain text ASCII.
+ DEBUGSERIAL=1
+ 
  #%.C
  #192x144
  #wwww will add these
@@@ -63,41 -69,46 +69,47 @@@ WLIBQ=-
  WCLQ=-zq $(WLIBQ)
  UPXQ=-qqq
  
- AFLAGS=-mh -0 -d1
+ AFLAGS=-mh -0 -d2
  16FLAGS=-fh=16.hed
  BAKAPIFLAGS=-fh=bakapi.hed
- SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#55808#60000
+ SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000
  DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
  ZFLAGS=-zk0 -zc -zp8 $(WCLQ) ## -zm
  CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo -i$(DOSLIB)##wwww
  OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
  FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
  
 +PCX2VRL=$(DOSLIBDIR)/hw/vga/pcx2vrl
  
- #DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
  VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
  DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
- 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)
+ 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)
  
  GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) $(DOSLIBLIBS)
  
  DOSLIBLIBS=$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib
- #$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vgatty.lib
  
- TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe
- # tsthimem.exe
- #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
+ !ifeq DEBUGSERIAL 1
+ FLAGS += -DDEBUGSERIAL
+ DOSLIBOBJ += 8250.$(OBJ)
+ DOSLIBLIBS += $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250$(DIRSEP)dos86h$(DIRSEP)8250.lib
+ !endif
+ 
+ TESTEXEC = exmmtest.exe test.exe test0.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe
+ 
  EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
  
  all: $(EXEC) joytest.exe vrs
- 
- #$(16LIBOBJS) => 16.lib bug....
+ #16.lib => $(16LIBOBJS) bug....
+ 16LIB=$(16LIBOBJS)
+ !ifeq DEBUGSERIAL 1
+ 16LIB += $(DOSLIBLIBS)
+ !endif
  #
  #game and bakapi executables
  #
- 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
-       wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=16.mah
+ 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib
+       wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib -fm=16.mah
  
  bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS)
        wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) -fm=bakapi.mah
@@@ -105,15 -116,15 +117,15 @@@
  #
  #Test Executables!
  #
- scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
-       wcl $(FLAGS) scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=scroll.mah
+ scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib
+       wcl $(FLAGS) scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib -fm=scroll.mah
  scroll.$(OBJ): $(SRC)scroll.c
        wcl $(FLAGS) -c $(SRC)scroll.c
  
  
  # NOTE: dos86h = 16-bit huge memory model. memory model must match!
  tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
- #     %write tmp.cmd option quiet option map=tesuto.mah $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe
+ #     %write tmp.cmd option quiet option max=tesuto.mah $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe
  #     %write tmp.cmd library $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib
  #     %write tmp.cmd library $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib
  #     @wlink @tmp.cmd
@@@ -121,47 -132,38 +133,38 @@@
  tesuto.$(OBJ): $(SRC)tesuto.c
        wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
  
- test.exe: test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ)
-       wcl $(FLAGS) test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) -fm=test.mah
- 
- test2.exe: test2.$(OBJ) gfx.lib
-       wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.mah
+ test.exe: test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) $(DOSLIBLIBS) $(16LIB)
+       wcl $(FLAGS) test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) $(DOSLIBLIBS) $(16LIB) -fm=test.mah
  
- fonttest.exe: fonttest.$(OBJ) $(16LIBOBJS) gfx.lib
-       wcl $(FLAGS) fonttest.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fonttest.mah
+ test2.exe: test2.$(OBJ) $(DOSLIBLIBS) gfx.lib
+       wcl $(FLAGS) test2.$(OBJ) $(DOSLIBLIBS) gfx.lib -fm=test2.mah
  
- #fonttes0.exe: fonttes0.$(OBJ) $(16LIBOBJS)
- #     wcl $(FLAGS) fonttes0.$(OBJ) $(16LIBOBJS)
+ test0.exe: test0.$(OBJ)
+       wcl $(FLAGS) test0.$(OBJ) -fm=test0.mah
  
- fontgfx.exe: fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib $(DOSLIBLIBS)
-       wcl $(FLAGS) fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib $(DOSLIBLIBS) -fm=fontgfx.mah
+ fonttest.exe: fonttest.$(OBJ) $(16LIB) gfx.lib
+       wcl $(FLAGS) fonttest.$(OBJ) $(16LIB) gfx.lib -fm=fonttest.mah
  
- inputest.exe: inputest.$(OBJ) $(16LIBOBJS)
-       wcl $(FLAGS) inputest.$(OBJ) $(16LIBOBJS) -fm=inputest.mah
+ #fonttes0.exe: fonttes0.$(OBJ) $(16LIB)
+ #     wcl $(FLAGS) fonttes0.$(OBJ) $(16LIB)
  
- #sountest.exe: sountest.$(OBJ) $(16LIBOBJS)
- #     wcl $(FLAGS) sountest.$(OBJ) $(16LIBOBJS)
+ fontgfx.exe: fontgfx.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+       wcl $(FLAGS) fontgfx.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) -fm=fontgfx.mah
  
- #miditest.exe: miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ)
- #     wcl $(FLAGS) miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ)
+ inputest.exe: inputest.$(OBJ) $(16LIB)
+       wcl $(FLAGS) inputest.$(OBJ) $(16LIB) -fm=inputest.mah
  
- tsthimem.exe: tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
-       wcl $(FLAGS) tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) -fm=tsthimem.mah
- 
- #testemm.exe: testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
- #     wcl $(FLAGS) testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
- 
- #testemm0.exe: testemm0.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
- #     wcl $(FLAGS) testemm0.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
+ #sountest.exe: sountest.$(OBJ) $(16LIB)
+ #     wcl $(FLAGS) sountest.$(OBJ) $(16LIB)
  
  pcxtest.exe: pcxtest.$(OBJ) gfx.lib
        wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.mah
  
- palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIBOBJS)
-       wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.mah #$(16LIBOBJS)
+ palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIB)
+       wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.mah #$(16LIB)
  
- palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIBOBJS)
-       wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.mah #$(16LIBOBJS)
+ palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIB)
+       wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.mah #$(16LIB)
  
  pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
        wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.mah
@@@ -169,26 -171,17 +172,17 @@@
  planrpcx.exe: planrpcx.$(OBJ) gfx.lib
        wcl $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.mah
  
- maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
-       wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=maptest.mah
- 
- #maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)
- #     wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)
- 
- #emmtest.exe: emmtest.$(OBJ) memory.$(OBJ)
- #     wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ)
+ maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib
+       wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib -fm=maptest.mah
  
- #emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
- #     wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
+ fmemtest.exe: fmemtest.$(OBJ) $(16LIB)
+       wcl $(FLAGS) fmemtest.$(OBJ) $(16LIB) -fm=fmemtest.mah
  
- fmemtest.exe: fmemtest.$(OBJ) $(16LIBOBJS)
-       wcl $(FLAGS) fmemtest.$(OBJ) $(16LIBOBJS) -fm=fmemtest.mah
+ exmmtest.exe: exmmtest.$(OBJ) $(16LIB)
+       wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.mah $(16LIB)
  
- exmmtest.exe: exmmtest.$(OBJ) $(16LIBOBJS)
-       wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.mah $(16LIBOBJS)
- 
- vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIBOBJS)
-       wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.mah $(16LIBOBJS)
+ vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB)
+       wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.mah $(16LIB)
        #====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.mah
  
  
@@@ -207,6 -200,9 +201,9 @@@ test.$(OBJ): $(SRC)test.c $(SRCLIB)mode
  test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
        wcl $(FLAGS) -c $(SRC)test2.c
  
+ test0.$(OBJ): $(SRC)test0.c
+       wcl $(FLAGS) -c $(SRC)test0.c
+ 
  pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
        wcl $(FLAGS) -c $(SRC)pcxtest.c
  
@@@ -277,11 -273,8 +274,8 @@@ vgmtest.$(OBJ): $(SRC)vgmtest.
  16.lib: $(16LIBOBJS)# doslib.lib vgmsnd.lib
        wlib -b $(WLIBQ) 16.lib $(16LIBOBJS)# doslib.lib vgmsnd.lib
  
- gfx.lib: $(GFXLIBOBJS)
-       wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS)
- 
- #doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
- #     wlib -b $(WLIBQ) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
+ gfx.lib: $(GFXLIBOBJS) 16_in.$(OBJ) 16_head.$(OBJ)
+       wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS) 16_in.$(OBJ) 16_head.$(OBJ)
  
  vgmsnd.lib: $(VGMSNDOBJ)
        wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ)
@@@ -298,6 -291,8 +292,8 @@@ $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DI
        cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh
  $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib:
        cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh
+ $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250$(DIRSEP)dos86h$(DIRSEP)8250.lib:
+       cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250 && .$(DIRSEP)make.sh
  
  joytest.exe:
        cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)joystick && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86h$(DIRSEP)test.exe $(PDIR)$(PDIR)$(PDIR)$(PDIR)$(PDIR)joytest.exe
@@@ -348,35 -343,12 +344,12 @@@ mapread.$(OBJ): $(SRCLIB)mapread.h $(SR
  16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c
        wcl $(FLAGS) -c $(SRCLIB)16_ca.c
  
+ 16_dbg.$(OBJ): $(SRCLIB)16_dbg.h $(SRCLIB)16_dbg.c
+       wcl $(FLAGS) -c $(SRCLIB)16_dbg.c
+ 
  midi.$(OBJ): $(SRCLIB)midi.h $(SRCLIB)midi.c
        wcl $(FLAGS) -c $(SRCLIB)midi.c
  
- #
- # doslib stuff
- #
- adlib.$(OBJ): $(DOSLIB)adlib.h $(DOSLIB)adlib.c
-       wcl $(FLAGS) -c $(DOSLIB)adlib.c
- 
- 8254.$(OBJ): $(DOSLIB)8254.h $(DOSLIB)8254.c
-       wcl $(FLAGS) -c $(DOSLIB)8254.c
- 
- 8259.$(OBJ): $(DOSLIB)8259.h $(DOSLIB)8259.c
-       wcl $(FLAGS) -c $(DOSLIB)8259.c
- 
- dos.$(OBJ): $(DOSLIB)dos.h $(DOSLIB)dos.c
-       wcl $(FLAGS) -c $(DOSLIB)dos.c
- 
- cpu.$(OBJ): $(DOSLIB)cpu.h $(DOSLIB)cpu.c
-       wcl $(FLAGS) -c $(DOSLIB)cpu.c
- 
- himemsys.$(OBJ): $(DOSLIB)himemsys.h $(DOSLIB)himemsys.c
-       wcl $(FLAGS) -c $(DOSLIB)himemsys.c
- 
- emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.c
-       wcl $(FLAGS) -c $(DOSLIB)emm.c
- 
- # end of doslib stuff
- 
  16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
        wcl $(FLAGS) -c $(SRCLIB)16_head.c
  
@@@ -397,12 -369,6 +370,6 @@@ vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(V
        wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
        #====wcl -c -mc $(VGMSNDLIB)vgmSnd.c
  
- #3812intf.$(OBJ): $(VGMSNDLIB)3812intf.h $(VGMSNDLIB)3812intf.c
- #     wcl $(FLAGS) -c $(VGMSNDLIB)3812intf.c
- 
- #farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
- #     wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
- 
  #memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
  #     wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
  
@@@ -493,8 -459,8 +460,8 @@@ uplibs: .symboli
  reinitlibs: .symbolic
        @rm -rf $(SRCLIB)doslib
        @rm -rf $(SRCLIB)jsmn
-       #@mkdir $(SRCLIB)doslib
-       #@mkdir $(SRCLIB)jsmn
+       @rm -rf 16/CatacombApocalypse
+       @rm -rf 16/wolf3d
        @wmake -h initlibs
  
  initlibs: .symbolic
@@@ -504,6 -470,10 +471,10 @@@
        @git clone https://github.com/joncampbell123/doslib.git
        @git clone https://github.com/zserge/jsmn.git
        @cd $(PDIR)$(PDIR)
+       @cd 16
+       @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git
+       @git clone https://github.com/id-Software/wolf3d.git
+       @cd $(PDIR)
  
  ##
  ##    experimental libs