From 6feaff34f8461d5e3a9542c2df359b585c1e5120 Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Fri, 16 Dec 2016 08:42:49 -0600
Subject: [PATCH] engi stuff moved to tdef and textinit is in startup16

---
 DEBUG.16W         | 210 ----------------------------------------------
 HEAP.16W          |  71 ----------------
 MEMINFO.16W       |   0
 MMDUMP.16W        | Bin 2550 -> 0 bytes
 git_igno.re       |   1 +
 makefile          |  12 +--
 src/16.c          |  34 +-------
 src/16.h          |   8 --
 src/fonttest.c    |   2 +-
 src/lib/16_tail.c |   3 +
 src/lib/16_tail.h |   1 +
 src/lib/16_tdef.h |   8 ++
 src/lib/16text.c  |   2 +-
 src/lib/16text.h  |   1 -
 14 files changed, 23 insertions(+), 330 deletions(-)
 delete mode 100755 DEBUG.16W
 delete mode 100755 HEAP.16W
 delete mode 100755 MEMINFO.16W
 delete mode 100755 MMDUMP.16W

diff --git a/DEBUG.16W b/DEBUG.16W
deleted file mode 100755
index 25724d77..00000000
--- a/DEBUG.16W
+++ /dev/null
@@ -1,210 +0,0 @@
-[0mSeg:0	Size:10117	Owner:0x0
-[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m[42;32m0000
-[0m[0mSeg:287e	Size:36	Owner:0x0
-[41;31m++[0m[42;32m
-[0m[0mSeg:28a2	Size:256	Owner:0x1650
-[44;34m++++[0m[42;32m
-[0m[0mSeg:29a2	Size:256	Owner:0x1442
-[45;35m++++[0m[42;32m
-[0m[0mSeg:2aa2	Size:256	Owner:0x1444
-[45;35m++++[0m[42;32m
-[0m[0mSeg:2ba2	Size:256	Owner:0x1446
-[45;35m++++[0m[42;32m
-[0m[0mSeg:2ca2	Size:256	Owner:0x1448
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:2da2	Size:256	Owner:0x144a
-[45;35m++++[0m[42;32m
-[0m[0mSeg:2ea2	Size:256	Owner:0x144c
-[45;35m++++[0m[42;32m
-[0m[0mSeg:2fa2	Size:256	Owner:0x144e
-[45;35m++++[0m[42;32m
-[0m[0mSeg:30a2	Size:256	Owner:0x1450
-[45;35m++++[0m[42;32m
-[0m[0mSeg:31a2	Size:256	Owner:0x1452
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:32a2	Size:256	Owner:0x1454
-[45;35m++++[0m[42;32m
-[0m[0mSeg:33a2	Size:256	Owner:0x1456
-[45;35m++++[0m[42;32m
-[0m[0mSeg:34a2	Size:256	Owner:0x1458
-[45;35m++++[0m[42;32m
-[0m[0mSeg:35a2	Size:256	Owner:0x145a
-[45;35m++++[0m[42;32m
-[0m[0mSeg:36a2	Size:256	Owner:0x145c
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:37a2	Size:256	Owner:0x145e
-[45;35m++++[0m[42;32m
-[0m[0mSeg:38a2	Size:256	Owner:0x1460
-[45;35m++++[0m[42;32m
-[0m[0mSeg:39a2	Size:256	Owner:0x1462
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3aa2	Size:256	Owner:0x1464
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3ba2	Size:256	Owner:0x1466
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:3ca2	Size:256	Owner:0x1468
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3da2	Size:256	Owner:0x146a
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3ea2	Size:256	Owner:0x146c
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3fa2	Size:256	Owner:0x146e
-[45;35m++++[0m[42;32m
-[0m[0mSeg:40a2	Size:256	Owner:0x1470
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:41a2	Size:256	Owner:0x1472
-[45;35m++++[0m[42;32m
-[0m[0mSeg:42a2	Size:256	Owner:0x1474
-[45;35m++++[0m[42;32m
-[0m[0mSeg:43a2	Size:256	Owner:0x1476
-[45;35m++++[0m[42;32m
-[0m[0mSeg:44a2	Size:256	Owner:0x1478
-[45;35m++++[0m[42;32m
-[0m[0mSeg:45a2	Size:256	Owner:0x147a
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:46a2	Size:256	Owner:0x147c
-[45;35m++++[0m[42;32m
-[0m[0mSeg:47a2	Size:256	Owner:0x147e
-[45;35m++++[0m[42;32m
-[0m[0mSeg:48a2	Size:256	Owner:0x1480
-[45;35m++++[0m[42;32m
-[0m[0mSeg:49a2	Size:256	Owner:0x1482
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4aa2	Size:256	Owner:0x1484
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:4ba2	Size:256	Owner:0x1486
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4ca2	Size:256	Owner:0x1488
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4da2	Size:256	Owner:0x148a
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4ea2	Size:256	Owner:0x148c
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4fa2	Size:256	Owner:0x148e
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:50a2	Size:256	Owner:0x1490
-[45;35m++++[0m[42;32m
-[0m[0mSeg:51a2	Size:256	Owner:0x1492
-[45;35m++++[0m[42;32m
-[0m[0mSeg:52a2	Size:256	Owner:0x1494
-[45;35m++++[0m[42;32m
-[0m[0mSeg:53a2	Size:256	Owner:0x1496
-[45;35m++++[0m[42;32m
-[0m[0mSeg:54a2	Size:256	Owner:0x1498
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:55a2	Size:256	Owner:0x149a
-[45;35m++++[0m[42;32m
-[0m[0mSeg:56a2	Size:256	Owner:0x149c
-[45;35m++++[0m[42;32m
-[0m[0mSeg:57a2	Size:256	Owner:0x149e
-[45;35m++++[0m[42;32m
-[0m[0mSeg:58a2	Size:256	Owner:0x14a0
-[45;35m++++[0m[42;32m
-[0m[0mSeg:59a2	Size:256	Owner:0x14a2
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:5aa2	Size:256	Owner:0x14a4
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5ba2	Size:256	Owner:0x14a6
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5ca2	Size:256	Owner:0x14a8
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5da2	Size:256	Owner:0x14aa
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5ea2	Size:256	Owner:0x14ac
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:5fa2	Size:256	Owner:0x14ae
-[45;35m++++[0m[42;32m
-[0m[0mSeg:60a2	Size:256	Owner:0x14b0
-[45;35m++++[0m[42;32m
-[0m[0mSeg:61a2	Size:256	Owner:0x14b2
-[45;35m++++[0m[42;32m
-[0m[0mSeg:62a2	Size:256	Owner:0x14b4
-[45;35m++++[0m[42;32m
-[0m[0mSeg:63a2	Size:256	Owner:0x14b6
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:64a2	Size:256	Owner:0x14b8
-[45;35m++++[0m[42;32m
-[0m[0mSeg:65a2	Size:256	Owner:0x14ba
-[45;35m++++[0m[42;32m
-[0m[0mSeg:66a2	Size:256	Owner:0x14bc
-[45;35m++++[0m[42;32m
-[0m[0mSeg:67a2	Size:256	Owner:0x14be
-[45;35m++++[0m[42;32m
-[0m[0mSeg:68a2	Size:256	Owner:0x14c0
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:69a2	Size:256	Owner:0x14c2
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6aa2	Size:256	Owner:0x14c4
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6ba2	Size:256	Owner:0x14c6
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6ca2	Size:256	Owner:0x14c8
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6da2	Size:256	Owner:0x14ca
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:6ea2	Size:256	Owner:0x14cc
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6fa2	Size:256	Owner:0x14ce
-[45;35m++++[0m[42;32m
-[0m[0mSeg:70a2	Size:256	Owner:0x14d0
-[45;35m++++[0m[42;32m
-[0m[0mSeg:71a2	Size:256	Owner:0x14d2
-[45;35m++++[0m[42;32m
-[0m[0mSeg:72a2	Size:256	Owner:0x14d4
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:73a2	Size:256	Owner:0x14d6
-[45;35m++++[0m[42;32m
-[0m[0mSeg:74a2	Size:256	Owner:0x14d8
-[45;35m++++[0m[42;32m
-[0m[0mSeg:75a2	Size:256	Owner:0x14da
-[45;35m++++[0m[42;32m
-[0m[0mSeg:76a2	Size:256	Owner:0x14dc
-[45;35m++++[0m[42;32m
-[0m[0mSeg:77a2	Size:256	Owner:0x14de
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:78a2	Size:256	Owner:0x14e0
-[45;35m++++[0m[42;32m
-[0m[0mSeg:79a2	Size:256	Owner:0x14e2
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7aa2	Size:256	Owner:0x14e4
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7ba2	Size:256	Owner:0x14e6
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7ca2	Size:256	Owner:0x14e8
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:7da2	Size:256	Owner:0x14ea
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7ea2	Size:256	Owner:0x14ec
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7fa2	Size:256	Owner:0x14ee
-[45;35m++++[0m[42;32m
-[0m[0mSeg:80a2	Size:256	Owner:0x14f0
-[45;35m++++[0m[42;32m
-[0m[0mSeg:81a2	Size:256	Owner:0x14f2
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:82a2	Size:256	Owner:0x14f4
-[45;35m++++[0m[42;32m
-[0m[0mSeg:83a2	Size:256	Owner:0x14f6
-[45;35m++++[0m[42;32m
-[0m[0mSeg:84a2	Size:256	Owner:0x14f8
-[45;35m++++[0m[42;32m
-[0m[0mSeg:85a2	Size:256	Owner:0x14fa
-[45;35m++++[0m[42;32m
-[0m[0mSeg:86a2	Size:256	Owner:0x14fc
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:87a2	Size:256	Owner:0x14fe
-[45;35m++++[0m[42;32m
-[0m[0mSeg:88a2	Size:256	Owner:0x1500
-[45;35m++++[0m[42;32m
-[0m[0mSeg:89a2	Size:256	Owner:0x1502
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8aa2	Size:256	Owner:0x1504
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8ba2	Size:256	Owner:0x1506
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:8ca2	Size:256	Owner:0x1508
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8da2	Size:401	Owner:0xec10
-[44;34m++++++[0m[42;32m
-[0m[0mSeg:b8a2	Size:18269	Owner:0x0
-[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m
\ No newline at end of file
diff --git a/HEAP.16W b/HEAP.16W
deleted file mode 100755
index 6b921851..00000000
--- a/HEAP.16W
+++ /dev/null
@@ -1,71 +0,0 @@
-
-	== default ==
-
-  FREE block at 28a00016 of size 18
-  USED block at 28a00028 of size 50
-  USED block at 28a0005a of size 50
-  USED block at 28a0008c of size 50
-  USED block at 28a000be of size 50
-  USED block at 28a000f0 of size 50
-  USED block at 28a00122 of size 50
-  USED block at 28a00154 of size 50
-  USED block at 28a00186 of size 50
-  USED block at 28a001b8 of size 50
-  USED block at 28a001ea of size 50
-  USED block at 28a0021c of size 50
-  USED block at 28a0024e of size 50
-  USED block at 28a00280 of size 50
-  FREE block at 28a002b2 of size 14
-  USED block at 28a002c0 of size 20
-  USED block at 28a002d4 of size 136
-  FREE block at 28a0035c of size 7328
-OK - end of heap
-
-	== near ==
-
-  USED block at 189fec66 of size 12
-  USED block at 189fec72 of size 330
-  USED block at 189fedbc of size 52
-  USED block at 189fedf0 of size 20
-  USED block at 189fee04 of size 20
-  USED block at 189fee18 of size 20
-  USED block at 189fee2c of size 20
-  USED block at 189fee40 of size 20
-  USED block at 189fee54 of size 4520
-OK - end of heap
-
-	== far ==
-
-  USED block at 28a00016 of size 18
-  USED block at 28a00028 of size 50
-  USED block at 28a0005a of size 50
-  USED block at 28a0008c of size 50
-  USED block at 28a000be of size 50
-  USED block at 28a000f0 of size 50
-  USED block at 28a00122 of size 50
-  USED block at 28a00154 of size 50
-  USED block at 28a00186 of size 50
-  USED block at 28a001b8 of size 50
-  USED block at 28a001ea of size 50
-  USED block at 28a0021c of size 50
-  USED block at 28a0024e of size 50
-  USED block at 28a00280 of size 50
-  USED block at 28a002b2 of size 14
-  USED block at 28a002c0 of size 20
-  USED block at 28a002d4 of size 136
-  USED block at 28a0035c of size 7328
-OK - end of heap
-
-Memory Type         Total      Used       Free
-----------------  --------   --------   --------
-Default		   8166		806	  7360
-Near		   5014		494	  4520
-Far		   8166		806	  7360
-----------------  --------   --------   --------
-coreleft = 4518
-farcoreleft = 28106
-GetFreeSize = 23610
-GetNearFreeSize = 4520
-GetFarFreeSize = 23610
-memavl = 4518
-stackavail = 31527
diff --git a/MEMINFO.16W b/MEMINFO.16W
deleted file mode 100755
index e69de29b..00000000
diff --git a/MMDUMP.16W b/MMDUMP.16W
deleted file mode 100755
index 9c6a7aa6b786c64690b86b0bafb645984cd6e120..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2550
zcmZ|RyG=tu002Q^Bzkxu1W0H5-4BT#XyLv!&;}hNCpbV8Z#3D4?+~u@<8q$Y<Mr$5
z?f5*>E!<w7!(TWRl0s2v3PWKb#GoKYlq1R!<%n`bIieg%jwDBtBgv8ENOB}Ok{nr%
zEJv0j%aP^Ca%4HO97T>IN0Fn*QRFCc6gi3<RgNl0m7~g0<*0I0IjS5@jwVNwqsh_a
zXmT_;njBq@E=QN6%hBcNa&$Sm97B#F$B<*lG2|F>3^|4zQ;sRelw-;<<(P6zIi?&-
zjwQ#EW681PSaK{mmK<A-EytE)%dzFya%?#^95KKV0~|5H5d$1Cz>)4#^#1?h*0|im
I&tvX>0let<ivR!s

diff --git a/git_igno.re b/git_igno.re
index 911e8919..15ee4357 100755
--- a/git_igno.re
+++ b/git_igno.re
@@ -19,6 +19,7 @@ TODO~
 LICENCE~
 *.mah
 *.MAH
+__wcl__.lnk
 !bcexmm.map
 !makefile
 !modex.lib
diff --git a/makefile b/makefile
index f0374020..2f4b6e4e 100755
--- a/makefile
+++ b/makefile
@@ -56,6 +56,7 @@ DOSLIBMAKEALL=.\build.bat
 !endif
 
 TARGET_OS = dos
+MEMORYMODE = l
 
 BUILD_ROOT=$+$(%__CWD__)$-
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
@@ -77,7 +78,7 @@ DOSLIB_DOS=src/lib/doslib/hw/dos
 DOSLIB_VGA=src/lib/doslib/hw/vga
 DOSLIB_8250=src/lib/doslib/hw/8250
 DOSLIB_JOYSTICK=src/lib/doslib/hw/joystick
-DOSLIB_MEMMODE=dos86l
+DOSLIB_MEMMODE=dos86$(MEMORYMODE)
 
 #
 # quiet flags
@@ -92,8 +93,7 @@ UPXQ=-qqq
 S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -zq -k32768#54096#60000
 Z_FLAGS=-zk0 -zc -zp8 -zm
 O_FLAGS=-obmilr -oe=24 -out -oh -ei -onac -ol+ -ok##x
-T_FLAGS=-bt=dos -wx -ml -0 -fpi87 -fo=.$(OBJ) -d1###### -e=65536
-#-mh
+T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -fo=.$(OBJ) -d1###### -e=65536
 
 CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
 !ifeq DEBUGSERIAL 1
@@ -101,7 +101,7 @@ CPPFLAGS += -DDEBUGSERIAL
 !endif
 AFLAGS=$(WCLQ) $(T_FLAGS)
 CFLAGS=$(WCLQ) $(T_FLAGS) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
-LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah $(S_FLAGS)
+LFLAGS=$(WCLQ) -l=dos -fd -fm=$^&.mah $(S_FLAGS)
 LIBFLAGS=$(WLIBQ) -b -n
 
 #
@@ -110,7 +110,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) $(OLDLIBOBJS)
-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) jsmn.$(OBJ) 16_map.$(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) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
 #16planar.$(OBJ) planar.$(OBJ) mapread.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
@@ -294,7 +294,7 @@ bakapee.$(OBJ):$(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
 bitmap.$(OBJ):	$(SRCLIB)/bitmap.c $(SRCLIB)/bitmap.h
 planar.$(OBJ):	$(SRCLIB)/planar.c $(SRCLIB)/planar.h
 scroll16.$(OBJ):$(SRCLIB)/scroll16.c $(SRCLIB)/scroll16.h
-16text.$(OBJ):	$(SRCLIB)/16text.c
+16text.$(OBJ):	$(SRCLIB)/16text.c $(SRCLIB)/16text.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
diff --git a/src/16.c b/src/16.c
index 5dcd6d31..8ef4d904 100755
--- a/src/16.c
+++ b/src/16.c
@@ -31,37 +31,9 @@ void
 main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	// DOSLIB: check our environment
-	probe_dos();
-
-	// DOSLIB: what CPU are we using?
-	// NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
-	//      So this code by itself shouldn't care too much what CPU it's running on. Except that other
-	//      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
-	//      the CPU to carry out tasks. --J.C.
-	cpu_probe();
-
-	// DOSLIB: check for VGA
-	if (!probe_vga()) {
-		printf("VGA probe failed\n");
-		return;
-	}
-	// hardware must be VGA or higher!
-	if (!(vga_state.vga_flags & VGA_IS_VGA)) {
-		printf("This program requires VGA or higher graphics hardware\n");
-		return;
-	}
-
-	if (_DEBUG_INIT() == 0) {
-#ifdef DEBUGSERIAL
-		printf("WARNING: Failed to initialize DEBUG output\n");
-#endif
-	}
-	_DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log
-	_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
+	Startup16(&gvar);
 
 	engi_stat = ENGI_RUN;
-	textInit();
 
 	/* save the palette */
 	dpal = modexNewPal();
@@ -72,10 +44,8 @@ main(int argc, char *argv[])
 	modexSavePalFile("data/g.pal", gpal);
 	VGAmodeX(1, 1, &gvar);
 //	modexPalBlack();	//so player will not see loadings~
-	IN_Startup();
 	IN_Default(0,&player,ctrl_Joystick);
 	//modexprint(&screen, 32, 32, 1, 2, 0, "a", 1);
-	start_timer(&gvar);
 	while(ENGI_EXIT != engi_stat)
 	{
 		IN_ReadControl(0,&player);
@@ -90,10 +60,10 @@ main(int argc, char *argv[])
 		case 2: cpus = "386 or newer"; break;
 		default: cpus = "internal error"; break;
 	}
+	Shutdown16(&gvar);
 	VGAmodeX(0, 1, &gvar);
 	printf("Project 16 16.exe. This is supposed to be the actual finished game executable!\n");
 	printf("version %s\n", VERSION);
 	printf("detected CPU type: %s\n", cpus);
-	IN_Shutdown();
 	modexFadeOn(4, dpal);
 }
diff --git a/src/16.h b/src/16.h
index 24f180ac..253cd9e9 100755
--- a/src/16.h
+++ b/src/16.h
@@ -31,12 +31,4 @@
 #include "src/lib/16_timer.h"
 #include "src/lib/16_dbg.h"
 
-typedef enum {
-	ENGI_EXIT,
-	ENGI_QUIT,
-	ENGI_RUN,
-	ENGI_INPUT,
-	ENGI_PAUSE
-} engi_stat_t;
-
 #endif /*__16_H_*/
diff --git a/src/fonttest.c b/src/fonttest.c
index a7757e47..6ecbdfbd 100755
--- a/src/fonttest.c
+++ b/src/fonttest.c
@@ -21,7 +21,7 @@
  */
 #include <stdio.h>
 #include <conio.h>
-#include "lib/types.h"
+#include "lib/16_t.h"
 #include "lib/16text.h"
 
 void main(int argc, char near *argv[])
diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index 6cd9eb92..767ebfcc 100755
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -24,6 +24,7 @@
  */
 
 #include "src/lib/16_tail.h"
+#include "src/lib/16text.h"
 
 /*
 ==========================
@@ -68,6 +69,8 @@ void Startup16(global_game_variables_t *gvar)
 	}
 	_DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log
 	_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
+
+	textInit();
 #endif
 	gvar->mm.mmstarted=0;
 	gvar->pm.PMStarted=0;
diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 8cd30094..f268469b 100755
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -24,6 +24,7 @@
 #define	__16_TAIL__
 
 #include "src/lib/16_head.h"
+#include "src/lib/16text.h"
 #include "src/lib/16_pm.h"
 #include "src/lib/16_mm.h"
 #include "src/lib/16_ca.h"
diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 2ea3f9fe..d38d8a9b 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -330,6 +330,14 @@ typedef struct
 //==========================================================================
 
 //actual global game varables!
+typedef enum {
+	ENGI_EXIT,
+	ENGI_QUIT,
+	ENGI_RUN,
+	ENGI_INPUT,
+	ENGI_PAUSE
+} engi_stat_t;
+
 typedef struct
 {
 	video_t	video;	// video settings variable
diff --git a/src/lib/16text.c b/src/lib/16text.c
index 0f946510..d395c027 100755
--- a/src/lib/16text.c
+++ b/src/lib/16text.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "16text.h"
+#include "src/lib/16text.h"
 
 /* this array holds the rom font descriptors */
 font_t romFonts[4];
diff --git a/src/lib/16text.h b/src/lib/16text.h
index ed037ce5..c6f3e36c 100755
--- a/src/lib/16text.h
+++ b/src/lib/16text.h
@@ -31,7 +31,6 @@
 #include <jstring.h>
 #include <jctype.h>
 #endif
-//#include "src/lib/16_t.h"
 #include "src/lib/16_head.h"
 
 /* font information type */
-- 
2.39.2