From: sparky4 <sparky4@cock.li>
Date: Fri, 26 Jun 2015 21:46:16 +0000 (-0500)
Subject: wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=870f290d0af578c5dbdd58d1ac5ddd91c92f2d6d;p=16.git

wwww
	modified:   16.LIB
	modified:   16.exe
	modified:   Project 16.bfproject
	modified:   inputest.exe
	deleted:    link.eer
	modified:   makefile
	modified:   maptest.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   src/lib/16_in.h
	modified:   src/lib/lib_head.c
	modified:   src/lib/lib_head.h
	modified:   test.exe
	modified:   test2.exe
---

diff --git a/16.LIB b/16.LIB
index c73feb57..a7096a2a 100644
Binary files a/16.LIB and b/16.LIB differ
diff --git a/16.exe b/16.exe
index 2b618baf..d7fd0f66 100644
Binary files a/16.exe and b/16.exe differ
diff --git a/Project 16.bfproject b/Project 16.bfproject
index 5d5f6db4..87267f39 100644
--- a/Project 16.bfproject	
+++ b/Project 16.bfproject	
@@ -3,7 +3,7 @@ e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:80:0:0:
 openfiles: /dos/z/16/src/palettec.c:882:0:0:
 openfiles: /dos/z/16/src/pcxtest.c:931:0:0:
-openfiles: /dos/z/16/src/scroll.c:18038:17181:1:
+openfiles: /dos/z/16/src/scroll.c:17909:17181:0:
 openfiles: /dos/z/16/src/fmemtest.c:891:0:0:
 openfiles: /dos/z/16/src/emmtest.c:405:0:0:
 openfiles: /dos/z/16/src/emsdump.c:890:0:0:
@@ -31,14 +31,17 @@ openfiles: /dos/z/16/src/lib/exmm/emmsize.h:1159:693:0:
 openfiles: /dos/z/16/src/lib/exmm/emmret.h:0:0:0:
 openfiles: /dos/z/16/src/lib/jsmn/farjsmn.c:7182:6170:0:
 openfiles: /dos/z/16/src/lib/jsmn/farjsmn.h:861:381:0:
-openfiles: /dos/z/16/src/lib/lib_head.c:883:0:0:
-openfiles: /dos/z/16/src/lib/lib_head.h:948:377:0:
-openfiles: /dos/z/16/makefile:1004:354:0:
-openfiles: /dos/z/16/src/lib/types.h:1009:0:0:
+openfiles: /dos/z/16/src/lib/lib_head.c:890:0:0:
+openfiles: /dos/z/16/src/lib/lib_head.h:3340:2984:0:
+openfiles: /dos/z/16/makefile:3246:2866:0:
+openfiles: /dos/z/16/src/lib/types.h:1043:128:0:
 openfiles: /dos/z/16/src/16.h:943:0:0:
-openfiles: /dos/z/16/src/16.c:928:0:0:
+openfiles: /dos/z/16/src/16.c:891:0:0:
 openfiles: /dos/z/16/src/lib/scroll16.h:961:0:0:
-openfiles: /dos/z/16/src/lib/scroll16.c:912:0:0:
+openfiles: /dos/z/16/src/lib/scroll16.c:0:0:0:
+openfiles: /dos/z/16/src/inputest.c:976:0:0:
+openfiles: /dos/z/16/src/lib/16_in.c:5652:5251:0:
+openfiles: /dos/z/16/src/lib/16_in.h:6531:4290:1:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -53,7 +56,7 @@ c2e.convert_iso: 0
 opendir: file:///dos/z/16/src/lib
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: puts
+ssearch_text: JoyDefs
 snr_casesens: 0
 view_blocks: 1
 name: Project 16
@@ -75,9 +78,6 @@ ssearch_regex: 0
 e2c.convert_iso: 0
 ssearch_casesens: 0
 charmap_block: 1
-recent_files: file:///dos/z/16/src/emm.c
-recent_files: file:///dos/z/16/src/far.c
-recent_files: file:///dos/z/16/src/emstest.c
 recent_files: file:///dos/z/16/src/lib/exmm/x.bat
 recent_files: file:///dos/z/16/src/lib/jsmn/jsmn.c
 recent_files: file:///dos/z/16/src/lib/jsmn/jsmn.h
@@ -125,8 +125,11 @@ recent_files: file:///dos/z/16/src/16.c
 recent_files: file:///dos/z/16/src/lib/scroll16.h
 recent_files: file:///dos/z/16/src/lib/scroll16.c
 recent_files: file:///dos/z/16/src/16.h
+recent_files: file:///dos/z/16/src/inputest.c
+recent_files: file:///dos/z/16/src/lib/16_in.h
+recent_files: file:///dos/z/16/src/lib/16_in.c
 snr_replacetype: 0
-savedir: file:///dos/z/16/src
+savedir: file:///dos/z/16/src/lib
 spell_check_default: 1
 spell_insert_entities: 0
 last_filefilter: 
@@ -136,13 +139,6 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: <alloc
-searchlist: pcxt
-searchlist: pallettec
-searchlist: palettec
-searchlist: free
-searchlist: gfree
-searchlist: gefree
 searchlist: getfree
 searchlist: offset
 searchlist: _dos)_
@@ -151,6 +147,13 @@ searchlist: '_dos_geninterrupt
 searchlist: _dos_geninterrupt
 searchlist: geninterrupt
 searchlist: puts
+searchlist: ctrl_Keyboard
+searchlist: keyser
+searchlist: text
+searchlist: joydeg
+searchlist: joydefs
+searchlist: MousePresent
+searchlist: JoyDefs
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0
diff --git a/inputest.exe b/inputest.exe
index e69de29b..bd0d00e8 100644
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/link.eer b/link.eer
deleted file mode 100644
index 3f0e72f2..00000000
--- a/link.eer
+++ /dev/null
@@ -1,34 +0,0 @@
-Open Watcom Make Version 1.9
-Portions Copyright (c) 1988-2002 Sybase, Inc. All Rights Reserved.
-Source code is available under the Sybase Open Watcom Public License.
-See http://www.openwatcom.org/ for details.
-	wcl -0 -d2 -lr -ot -ox -ob -oh -or -zkl -wo -x inputest.obj 16_in.obj
-Open Watcom C/C++16 Compile and Link Utility Version 1.9
-Portions Copyright (c) 1988-2002 Sybase, Inc. All Rights Reserved.
-Source code is available under the Sybase Open Watcom Public License.
-See http://www.openwatcom.org/ for details.
-	wlink @__wcl__.lnk
-Open Watcom Linker Version 1.9
-Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Source code is available under the Sybase Open Watcom Public License.
-See http://www.openwatcom.org/ for details.
-loading object files
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _JoyDefs ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _Keyboard ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _Controls ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _MouseDownCount ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _JoysPresent ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _ControlTypeUsed ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _JoyPadPresent ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _LastASCII ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _LastScan ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _clockdw ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _JoystickCalibrated ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _KbdDefs ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _Paused ignored
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _MousePresent ignored
-searching libraries
-Error! E2028: US_CheckParm_ is an undefined reference
-creating a DOS executable
-file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): undefined symbol US_CheckParm_
-Error: Linker returned a bad status
diff --git a/makefile b/makefile
index 7582ae3b..aa6373e2 100644
--- a/makefile
+++ b/makefile
@@ -38,8 +38,8 @@ test2.exe: test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OB
 fonttest.exe: 16text.$(OBJ) fonttest.$(OBJ)
 	wcl $(FLAGS) fonttest.$(OBJ) 16text.$(OBJ)
 
-inputest.exe: inputest.$(OBJ) 16_in.$(OBJ)
-	wcl $(FLAGS) inputest.$(OBJ) 16_in.$(OBJ)
+inputest.exe: inputest.$(OBJ) 16_in.$(OBJ) lib_head.$(OBJ)
+	wcl $(FLAGS) inputest.$(OBJ) 16_in.$(OBJ) lib_head.$(OBJ)
 
 16text.$(OBJ): $(SRCLIB)16text.c
 	wcl -c $(SRCLIB)16text.c
diff --git a/maptest.exe b/maptest.exe
index 75927896..22ce45d7 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index c8da1701..c75cd3b7 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 5c8ec4c5..0be455b7 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 16a6ed84..1e099ee4 100644
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -27,7 +27,7 @@
 #define	__16_IN__
 
 #include "src/lib/lib_head.h"
-#include "src/lib/16_us.h"
+//#include "src/lib/16_us.h"
 
 #ifdef	__DEBUG__
 #define	__DEBUG_InputMgr__
@@ -135,10 +135,11 @@ typedef	byte		ScanCode;
 #define	MDelta		11
 
 #define	MouseInt	0x33
-
+#ifdef DEMO0
 typedef	enum		{
 						demo_Off,demo_Record,demo_Playback,demo_PlayDone
-					} Demo;
+					} Demo;
+#endif
 typedef	enum		{
 						ctrl_None,				// MDM (GAMERS EDGE) - added
 						ctrl_Keyboard,
@@ -180,7 +181,6 @@ typedef	struct		{
 									joyMultXL,joyMultYL,
 									joyMultXH,joyMultYH;
 					} JoystickDef;
-
 /*
 =============================================================================
 
@@ -192,33 +192,33 @@ typedef	struct		{
 //
 // configuration variables
 //
-boolean			MousePresent;
-boolean			JoysPresent[MaxJoys];
-boolean			JoyPadPresent;
+static boolean			MousePresent;
+static boolean			JoysPresent[MaxJoys];
+static boolean			JoyPadPresent;
 
 
 // 	Global variables
-		boolean JoystickCalibrated=false;		// MDM (GAMERS EDGE) - added
-		ControlType ControlTypeUsed;				// MDM (GAMERS EDGE) - added
+		static boolean JoystickCalibrated=false;		// MDM (GAMERS EDGE) - added
+		static ControlType ControlTypeUsed;				// MDM (GAMERS EDGE) - added
 
-		boolean		Keyboard[NumCodes];
-		boolean		Paused;
-		char		LastASCII;
-		ScanCode	LastScan;
+		static boolean		Keyboard[NumCodes];
+		static boolean		Paused;
+		static char		LastASCII;
+		static ScanCode	LastScan;
 
-		KeyboardDef	KbdDefs[] = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51};
-		JoystickDef	JoyDefs[MaxJoys];
-		ControlType	Controls[MaxPlayers];
+		static KeyboardDef	KbdDefs[] = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51};
+		static JoystickDef	JoyDefs[MaxJoys];
+		static ControlType	Controls[MaxPlayers];
 
-		dword	MouseDownCount;
+		static dword	MouseDownCount;
 
 #ifdef DEMO0
-		Demo		DemoMode = demo_Off;
-		byte /*_seg*/	*DemoBuffer;
-		word		DemoOffset,DemoSize;
+		static Demo		DemoMode = demo_Off;
+		static byte /*_seg*/	*DemoBuffer;
+		static word		DemoOffset,DemoSize;
 #endif
 
-
+extern dword far* clockdw;
 
 /*
 =============================================================================
@@ -313,6 +313,5 @@ extern	char		IN_WaitForASCII(void);
 extern	ScanCode	IN_WaitForKey(void);
 extern	word		IN_GetJoyButtonsDB(word joy);
 
-static void interrupt INL_KeyService(void);
-
+//static void interrupt INL_KeyService(void);
 #endif
diff --git a/src/lib/lib_head.c b/src/lib/lib_head.c
index 0f080bca..4ca25c9c 100644
--- a/src/lib/lib_head.c
+++ b/src/lib/lib_head.c
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/lib_head.h"
-
+
 /* local function */
 void wait(clock_t wait);
 void* AllocateLargestFreeBlock(size_t* Size);
@@ -128,3 +128,38 @@ filesize(FILE *fp)
 	fseek(fp, save_pos, SEEK_SET);
 	return(size_of_file);
 }
+
+///////////////////////////////////////////////////////////////////////////
+//
+//      US_CheckParm() - checks to see if a string matches one of a set of
+//              strings. The check is case insensitive. The routine returns the
+//              index of the string that matched, or -1 if no matches were found
+//
+///////////////////////////////////////////////////////////////////////////
+int
+US_CheckParm(char *parm,char **strings)
+{
+	char    cp,cs,
+			*p,*s;
+	int             i;
+
+	while (!isalpha(*parm)) // Skip non-alphas
+		parm++;
+
+	for (i = 0;*strings && **strings;i++)
+	{
+		for (s = *strings++,p = parm,cs = cp = 0;cs == cp;)
+		{
+			cs = *s++;
+			if (!cs)
+				return(i);
+			cp = *p++;
+
+			if (isupper(cs))
+				cs = tolower(cs);
+			if (isupper(cp))
+				cp = tolower(cp);
+		}
+	}
+	return(-1);
+}
diff --git a/src/lib/lib_head.h b/src/lib/lib_head.h
index 2ff4819f..cf50054d 100644
--- a/src/lib/lib_head.h
+++ b/src/lib/lib_head.h
@@ -22,11 +22,13 @@
 
 #ifndef _LIBHEAD_H_
 #define _LIBHEAD_H_
+#include <i86.h>
 #include <dos.h>
 #include <stdio.h>
 #include <conio.h> // just for wait
 #include <time.h> // just for wait
 #include <stdlib.h>
+#include <ctype.h>
 #include "src/lib/types.h"
 
 /* Control codes for all keys on the keyboard */
@@ -121,9 +123,9 @@
 #define KEY_MENU		(0x75)
 */
 
-#define	nil	((void *)0)
+static dword far* clockdw= (dword far*) 0x046C; /* 18.2hz clock */
 
-dword far* clockdw= (dword far*) 0x046C; /* 18.2hz clock */
+#define	nil	((void *)0)
 
 #define peekb(segm,ofs) (*(byte far*)MK_FP((segm),(ofs)))
 #define peekw(segm,ofs) (*(word far*)MK_FP((segm),(ofs)))
@@ -137,5 +139,6 @@ void wait(clock_t wait);
 void* AllocateLargestFreeBlock(size_t* Size);
 size_t GetFreeSize(void);
 long int filesize(FILE *fp);
+int US_CheckParm(char *parm,char **strings);
 
 #endif/*_LIBHEAD_H_*/
diff --git a/test.exe b/test.exe
index 122bcab1..c49bbaa8 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index cea7c7d3..d44b3468 100644
Binary files a/test2.exe and b/test2.exe differ