wwww

Signed-off-by: sparky4 <sparky4@cock.li>

diff --git a/16.LIB b/16.LIB
index e78e27b08f3f1d7c6370b2ddecffbdc094a1e93c..6967e3b4d421110c7ba8d9243b7c6f042680c259 100644 (file)
Binary files a/16.LIB and b/16.LIB differ

diff --git a/GFX.LIB b/GFX.LIB
index 8a1b04b40875e21ffddfd344c85bd24648345219..628f961b6d155724a60e7f1fb64fa0b632b23142 100644 (file)
Binary files a/GFX.LIB and b/GFX.LIB differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 4b2cebff6e933f6df564099fd5301041ad46f82a..18e3f4fa1e48f4646276de6afd7a76b20d5e1aeb 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/makefile b/makefile
index 39c7739328afe69cb211fd20f9c8c2a6c26b8cdc..d49ccf9e743813405f6c37773de92eea2c8724ec 100644 (file)
--- a/makefile
+++ b/makefile
@@ -42,9 +42,6 @@ fonttest.exe: fonttest.$(OBJ) 16.lib
 inputest.exe: inputest.$(OBJ) 16.lib\r
        wcl $(FLAGS) inputest.$(OBJ) 16.lib\r
 \r
-exmmtest.exe: exmmtest.$(OBJ) 16.lib\r
-       wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16.lib\r
-\r
 pcxtest.exe: pcxtest.$(OBJ) 16.lib\r
        wcl $(FLAGS) pcxtest.$(OBJ) 16.lib\r
 \r
@@ -66,6 +63,9 @@ emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
 fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ)\r
        wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)\r
 \r
+exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)\r
+        wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)\r
+\r
 #\r
 #executable's objects\r
 #\r

diff --git a/makefile.gnu b/makefile.gnu
index 4bb02c3873704430b10fc65ab6b36909c60f5a33..1743f4665e5f8fd469b8707af160e513e7ba4ee4 100644 (file)
--- a/makefile.gnu
+++ b/makefile.gnu
@@ -42,9 +42,6 @@ fonttest.exe: fonttest.$(OBJ) 16.lib
 inputest.exe: inputest.$(OBJ) 16.lib\r
        wcl $(FLAGS) inputest.$(OBJ) 16.lib\r
 \r
-exmmtest.exe: exmmtest.$(OBJ) 16.lib\r
-       wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16.lib\r
-\r
 pcxtest.exe: pcxtest.$(OBJ) 16.lib\r
        wcl $(FLAGS) pcxtest.$(OBJ) 16.lib\r
 \r
@@ -66,6 +63,9 @@ emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
 fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ)\r
        wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)\r
 \r
+exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)\r
+        wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)\r
+\r
 #\r
 #executable's objects\r
 #\r

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 2124d3f9658d3a983d989674ba53e97fe84f536a..db3059d2b713da612f74e9db3867129819c4b863 100644 (file)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -27,5 +27,6 @@
 void
 main(int argc, char *argv[])
 {
-
+       MM_Startup();
+       MM_Shutdown();
 }

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 570ec346b32cc937508075dfc09b89440394d867..44426a063dad58a3c37655f5b31697522bbb090e 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1062,7 +1062,7 @@ strcat (scratch,"\n");
 
 //CA_CloseDebug ();
 
-       IN_Ack();
+//++++mh       IN_Ack();
 //**** VW_SetLineWidth(64);
        bufferofs = temp;
 }
@@ -1146,4 +1146,38 @@ void MM_BombOnError (boolean bomb)
        bombonerror = bomb;
 }
 
+///////////////////////////////////////////////////////////////////////////
+//
+//      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/16_mm.h b/src/lib/16_mm.h
index e864d042fb990d4916ac66346343224dcd2bfa5e..663c7df9b167f11af101d6a9b99f26fb054936b8 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -24,13 +24,13 @@
 #include <string.h>
 #include <malloc.h>
 #include "src/lib/lib_head.h"
-#include "src/lib/16_in.h"
+//++++mh       #include "src/lib/16_in.h"
 
-#if 1          // 1 == Debug/Dev  ;  0 == Production/final
+//****#if 1            // 1 == Debug/Dev  ;  0 == Production/final
 #define OUT_OF_MEM_MSG "MM_GetPtr: Out of memory!\nYou were short :%ld bytes"
-#else
-#define OUT_OF_MEM_MSG "\npee\n"
-#endif
+//****#else
+//****#define OUT_OF_MEM_MSG   "\npee\n"
+//****#endif
 
 
 #define SAVENEARHEAP   0x400           // space to leave in data segment
@@ -130,6 +130,8 @@ void                MML_ShutdownXMS (void);
 void           MML_UseSpace (unsigned segstart, unsigned seglength);
 void           MML_ClearBlock (void);
 
+int US_CheckParm(char *parm,char **strings);
+
 //==========================================================================
 
 #endif

diff --git a/src/lib/16_us.h b/src/lib/16_us.h
deleted file mode 100644 (file)
index 8bcfa00..0000000
--- a/src/lib/16_us.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Catacomb Armageddon Source Code\r
- * Copyright (C) 1993-2014 Flat Rock Software\r
- *\r
- * This program is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License along\r
- * with this program; if not, write to the Free Software Foundation, Inc.,\r
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
- */\r
-\r
-//\r
-//     ID Engine\r
-//     ID_US.h - Header file for the User Manager\r
-//     v1.0d1\r
-//     By Jason Blochowiak\r
-//\r
-#ifndef        __ID_US__\r
-#define        __ID_US__
-
-#include "lib_head.h"\r
-\r
-#ifdef __DEBUG__\r
-#define        __DEBUG_UserMgr__\r
-#endif\r
-\r
-extern int             US_CheckParm(char *parm,char **strings);\r
-
-#endif\r