From 44422cc93d788d1e5c51cbfb3e9ac2a218cb1cb5 Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Fri, 10 Mar 2017 10:39:42 -0600
Subject: [PATCH] __seguse.txt added to show _seg usage also OpenVGMFile needs
 to be ported to 16_snd.c  ][ ca needs huge amounts of work and i should
 remember what needs to be done soon also i should reverify 16_in.c to make
 sure it can work with other code of id engine ][ added 1.9 support wwww and
 fixed 16_vlpal.obj compile error\~ [it was a 8.3 file name extention error it
 was a simple issue wwww] [going to work on more on 16_in.c]

---
 makefile         |  2 +-
 src/lib/16_in.h  | 45 +--------------------------------------------
 src/lib/16_in_.h | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/makefile b/makefile
index c396e4c6..58f4ec18 100755
--- a/makefile
+++ b/makefile
@@ -339,7 +339,7 @@ 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_.$(OBJ):	 $(SRCLIB)/16_in_.c $(SRCLIB)/16_in_.h
+16_in_.$(OBJ):	 $(SRCLIB)/16_in_.c $(SRCLIB)/16_in.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
diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 39519c20..4c039165 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -202,37 +202,7 @@ typedef	struct		{
 									joyMaxX,joyMaxY,
 									joyMultXL,joyMultYL,
 									joyMultXH,joyMultYH;
-					} JoystickDef;
-
-typedef	struct
-{
-	int x; //player exact position on the viewable map
-	int y; //player exact position on the viewable map
-	int tx; //player tile position on the viewable map
-	int ty; //player tile position on the viewable map
-	int triggerx; //player's trigger box tile position on the viewable map
-	int triggery; //player's trigger box tile position on the viewable map
-	int sheetsetx; //NOT USED YET! player sprite sheet set on the image x
-	int sheetsety; //NOT USED YET! player sprite sheet set on the image y
-	byte d;		//direction to render sprite!! wwww
-	byte q;		//loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www
-	byte near pdir;	//previous direction~
-	word speed;		//player speed!
-	word spt;		//speed per tile
-#ifdef	__WATCOMC__
-	struct sprite	*spri;	//supposively the sprite sheet data
-	memptr		gr;
-	entity_t		*ent;
-#endif
-	bitmap_t	*data;		//supposively the sprite sheet data//old format
-	bitmap_t	bmp;
-	sword hp; //hitpoints of the player
-	int persist_aniframe;    // gonna be increased to 1 before being used, so 0 is ok for default
-	CursorInfo	info;
-	ControlType	Controls;
-//newer vars
-	int dx, dy, delta;	//TODO: what is this? ^^
-} player_t;*/
+					} JoystickDef;*/
 
 /*
 =============================================================================
@@ -241,19 +211,6 @@ typedef	struct
 
 =============================================================================
 */
-/*extern struct inconfig
-{
-	boolean			MousePresent;
-	boolean			JoysPresent[MaxJoys];
-	boolean		Keyboard[NumCodes];
-	boolean		Paused;
-	char		LastASCII;
-	ScanCode	LastScan;
-
-	KeyboardDef	KbdDefs[MaxKbds];
-	JoystickDef	JoyDefs[MaxJoys];
-} inpu;*/
-
 #ifdef DEMO0
 		static Demo		DemoMode = demo_Off;
 		static byte /*_seg*/	*DemoBuffer;
diff --git a/src/lib/16_in_.h b/src/lib/16_in_.h
index 969fdb7e..39519c20 100755
--- a/src/lib/16_in_.h
+++ b/src/lib/16_in_.h
@@ -204,6 +204,36 @@ typedef	struct		{
 									joyMultXH,joyMultYH;
 					} JoystickDef;
 
+typedef	struct
+{
+	int x; //player exact position on the viewable map
+	int y; //player exact position on the viewable map
+	int tx; //player tile position on the viewable map
+	int ty; //player tile position on the viewable map
+	int triggerx; //player's trigger box tile position on the viewable map
+	int triggery; //player's trigger box tile position on the viewable map
+	int sheetsetx; //NOT USED YET! player sprite sheet set on the image x
+	int sheetsety; //NOT USED YET! player sprite sheet set on the image y
+	byte d;		//direction to render sprite!! wwww
+	byte q;		//loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www
+	byte near pdir;	//previous direction~
+	word speed;		//player speed!
+	word spt;		//speed per tile
+#ifdef	__WATCOMC__
+	struct sprite	*spri;	//supposively the sprite sheet data
+	memptr		gr;
+	entity_t		*ent;
+#endif
+	bitmap_t	*data;		//supposively the sprite sheet data//old format
+	bitmap_t	bmp;
+	sword hp; //hitpoints of the player
+	int persist_aniframe;    // gonna be increased to 1 before being used, so 0 is ok for default
+	CursorInfo	info;
+	ControlType	Controls;
+//newer vars
+	int dx, dy, delta;	//TODO: what is this? ^^
+} player_t;*/
+
 /*
 =============================================================================
 
@@ -211,6 +241,19 @@ typedef	struct		{
 
 =============================================================================
 */
+/*extern struct inconfig
+{
+	boolean			MousePresent;
+	boolean			JoysPresent[MaxJoys];
+	boolean		Keyboard[NumCodes];
+	boolean		Paused;
+	char		LastASCII;
+	ScanCode	LastScan;
+
+	KeyboardDef	KbdDefs[MaxKbds];
+	JoystickDef	JoyDefs[MaxJoys];
+} inpu;*/
+
 #ifdef DEMO0
 		static Demo		DemoMode = demo_Off;
 		static byte /*_seg*/	*DemoBuffer;
-- 
2.39.5