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 c73feb5..a7096a2 100644 (file)
Binary files a/16.LIB and b/16.LIB differ

diff --git a/16.exe b/16.exe
index 2b618ba..d7fd0f6 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 5d5f6db..87267f3 100644 (file)
--- 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 e69de29..bd0d00e 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/link.eer b/link.eer
deleted file mode 100644 (file)
index 3f0e72f..0000000
--- a/link.eer
+++ /dev/null
@@ -1,34 +0,0 @@
-Open Watcom Make Version 1.9\r
-Portions Copyright (c) 1988-2002 Sybase, Inc. All Rights Reserved.\r
-Source code is available under the Sybase Open Watcom Public License.\r
-See http://www.openwatcom.org/ for details.\r
-       wcl -0 -d2 -lr -ot -ox -ob -oh -or -zkl -wo -x inputest.obj 16_in.obj\r
-Open Watcom C/C++16 Compile and Link Utility Version 1.9\r
-Portions Copyright (c) 1988-2002 Sybase, Inc. All Rights Reserved.\r
-Source code is available under the Sybase Open Watcom Public License.\r
-See http://www.openwatcom.org/ for details.\r
-       wlink @__wcl__.lnk\r
-Open Watcom Linker Version 1.9\r
-Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.\r
-Source code is available under the Sybase Open Watcom Public License.\r
-See http://www.openwatcom.org/ for details.\r
-loading object files\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _JoyDefs ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _Keyboard ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _Controls ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _MouseDownCount ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _JoysPresent ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _ControlTypeUsed ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _JoyPadPresent ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _LastASCII ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _LastScan ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _clockdw ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _JoystickCalibrated ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _KbdDefs ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _Paused ignored\r
-Warning! W1027: file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): redefinition of _MousePresent ignored\r
-searching libraries\r
-Error! E2028: US_CheckParm_ is an undefined reference\r
-creating a DOS executable\r
-file 16_IN.OBJ(C:\Z\16\src\lib\16_IN.C): undefined symbol US_CheckParm_\r
-Error: Linker returned a bad status\r

diff --git a/makefile b/makefile
index 7582ae3..aa6373e 100644 (file)
--- 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)\r
        wcl $(FLAGS) fonttest.$(OBJ) 16text.$(OBJ)
 
-inputest.exe: inputest.$(OBJ) 16_in.$(OBJ)\r
-       wcl $(FLAGS) inputest.$(OBJ) 16_in.$(OBJ)\r
+inputest.exe: inputest.$(OBJ) 16_in.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) inputest.$(OBJ) 16_in.$(OBJ) lib_head.$(OBJ)\r
 \r
 16text.$(OBJ): $(SRCLIB)16text.c\r
        wcl -c $(SRCLIB)16text.c\r

diff --git a/maptest.exe b/maptest.exe
index 7592789..22ce45d 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index c8da170..c75cd3b 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 5c8ec4c..0be455b 100644 (file)
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 16a6ed8..1e099ee 100644 (file)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -27,7 +27,7 @@
 #define        __16_IN__\r
 
 #include "src/lib/lib_head.h"\r
-#include "src/lib/16_us.h"
+//#include "src/lib/16_us.h"
 \r
 #ifdef __DEBUG__\r
 #define        __DEBUG_InputMgr__\r
@@ -135,10 +135,11 @@ typedef   byte            ScanCode;
 #define        MDelta          11\r
 \r
 #define        MouseInt        0x33\r
-\r
+#ifdef DEMO0\r
 typedef        enum            {\r
                                                demo_Off,demo_Record,demo_Playback,demo_PlayDone\r
-                                       } Demo;\r
+                                       } Demo;
+#endif\r
 typedef        enum            {\r
                                                ctrl_None,                              // MDM (GAMERS EDGE) - added\r
                                                ctrl_Keyboard,\r
@@ -180,7 +181,6 @@ typedef     struct          {
                                                                        joyMultXL,joyMultYL,\r
                                                                        joyMultXH,joyMultYH;\r
                                        } JoystickDef;\r
-
 /*\r
 =============================================================================\r
 \r
@@ -192,33 +192,33 @@ typedef   struct          {
 //\r
 // configuration variables\r
 //\r
-boolean                        MousePresent;\r
-boolean                        JoysPresent[MaxJoys];\r
-boolean                        JoyPadPresent;\r
+static boolean                 MousePresent;\r
+static boolean                 JoysPresent[MaxJoys];\r
+static boolean                 JoyPadPresent;\r
 \r
 \r
 //     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
 \r
-               boolean         Keyboard[NumCodes];\r
-               boolean         Paused;\r
-               char            LastASCII;\r
-               ScanCode        LastScan;\r
+               static boolean          Keyboard[NumCodes];\r
+               static boolean          Paused;\r
+               static char             LastASCII;\r
+               static ScanCode LastScan;\r
 \r
-               KeyboardDef     KbdDefs[] = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51};\r
-               JoystickDef     JoyDefs[MaxJoys];\r
-               ControlType     Controls[MaxPlayers];\r
+               static KeyboardDef      KbdDefs[] = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51};\r
+               static JoystickDef      JoyDefs[MaxJoys];\r
+               static ControlType      Controls[MaxPlayers];\r
 \r
-               dword   MouseDownCount;
+               static dword    MouseDownCount;
 \r
 #ifdef DEMO0\r
-               Demo            DemoMode = demo_Off;\r
-               byte /*_seg*/   *DemoBuffer;\r
-               word            DemoOffset,DemoSize;
+               static Demo             DemoMode = demo_Off;\r
+               static byte /*_seg*/    *DemoBuffer;\r
+               static word             DemoOffset,DemoSize;
 #endif
 
-
+extern dword far* clockdw;
 
 /*\r
 =============================================================================\r
@@ -313,6 +313,5 @@ extern      char            IN_WaitForASCII(void);
 extern ScanCode        IN_WaitForKey(void);\r
 extern word            IN_GetJoyButtonsDB(word joy);
 
-static void interrupt INL_KeyService(void);\r
-\r
+//static void interrupt INL_KeyService(void);\r
 #endif\r

diff --git a/src/lib/lib_head.c b/src/lib/lib_head.c
index 0f080bc..4ca25c9 100644 (file)
--- a/src/lib/lib_head.c
+++ b/src/lib/lib_head.c
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/lib_head.h"
-\r
+
 /* local function */\r
 void wait(clock_t wait);
 void* AllocateLargestFreeBlock(size_t* Size);
@@ -128,3 +128,38 @@ filesize(FILE *fp)
        fseek(fp, save_pos, SEEK_SET);\r
        return(size_of_file);\r
 }
+
+///////////////////////////////////////////////////////////////////////////\r
+//\r
+//      US_CheckParm() - checks to see if a string matches one of a set of\r
+//              strings. The check is case insensitive. The routine returns the\r
+//              index of the string that matched, or -1 if no matches were found\r
+//\r
+///////////////////////////////////////////////////////////////////////////\r
+int\r
+US_CheckParm(char *parm,char **strings)\r
+{\r
+       char    cp,cs,\r
+                       *p,*s;\r
+       int             i;\r
+\r
+       while (!isalpha(*parm)) // Skip non-alphas\r
+               parm++;\r
+\r
+       for (i = 0;*strings && **strings;i++)\r
+       {\r
+               for (s = *strings++,p = parm,cs = cp = 0;cs == cp;)\r
+               {\r
+                       cs = *s++;\r
+                       if (!cs)\r
+                               return(i);\r
+                       cp = *p++;\r
+\r
+                       if (isupper(cs))\r
+                               cs = tolower(cs);\r
+                       if (isupper(cp))\r
+                               cp = tolower(cp);\r
+               }\r
+       }\r
+       return(-1);\r
+}

diff --git a/src/lib/lib_head.h b/src/lib/lib_head.h
index 2ff4819..cf50054 100644 (file)
--- 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)))\r
 #define peekw(segm,ofs) (*(word far*)MK_FP((segm),(ofs)))\r
@@ -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 122bcab..c49bbaa 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index cea7c7d..d44b346 100644 (file)
Binary files a/test2.exe and b/test2.exe differ