From: sparky4 Date: Sat, 27 Jun 2015 17:32:16 +0000 (-0500) Subject: wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=866232d8ee296189ab972a4c99c140dbe32c3353;p=16.git wwww Signed-off-by: sparky4 --- diff --git a/16.LIB b/16.LIB index e78e27b0..6967e3b4 100644 Binary files a/16.LIB and b/16.LIB differ diff --git a/GFX.LIB b/GFX.LIB index 8a1b04b4..628f961b 100644 Binary files a/GFX.LIB and b/GFX.LIB differ diff --git a/exmmtest.exe b/exmmtest.exe index 4b2cebff..18e3f4fa 100644 Binary files a/exmmtest.exe and b/exmmtest.exe differ diff --git a/makefile b/makefile index 39c77393..d49ccf9e 100644 --- a/makefile +++ b/makefile @@ -42,9 +42,6 @@ fonttest.exe: fonttest.$(OBJ) 16.lib inputest.exe: inputest.$(OBJ) 16.lib wcl $(FLAGS) inputest.$(OBJ) 16.lib -exmmtest.exe: exmmtest.$(OBJ) 16.lib - wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16.lib - pcxtest.exe: pcxtest.$(OBJ) 16.lib wcl $(FLAGS) pcxtest.$(OBJ) 16.lib @@ -66,6 +63,9 @@ emsdump.exe: emsdump.$(OBJ) memory.$(OBJ) fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ) wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ) +exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ) + wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ) + # #executable's objects # diff --git a/makefile.gnu b/makefile.gnu index 4bb02c38..1743f466 100644 --- a/makefile.gnu +++ b/makefile.gnu @@ -42,9 +42,6 @@ fonttest.exe: fonttest.$(OBJ) 16.lib inputest.exe: inputest.$(OBJ) 16.lib wcl $(FLAGS) inputest.$(OBJ) 16.lib -exmmtest.exe: exmmtest.$(OBJ) 16.lib - wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16.lib - pcxtest.exe: pcxtest.$(OBJ) 16.lib wcl $(FLAGS) pcxtest.$(OBJ) 16.lib @@ -66,6 +63,9 @@ emsdump.exe: emsdump.$(OBJ) memory.$(OBJ) fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ) wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ) +exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ) + wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ) + # #executable's objects # diff --git a/src/exmmtest.c b/src/exmmtest.c index 2124d3f9..db3059d2 100644 --- 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 570ec346..44426a06 100644 --- 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 e864d042..663c7df9 100644 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -24,13 +24,13 @@ #include #include #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 index 8bcfa006..00000000 --- a/src/lib/16_us.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Catacomb Armageddon Source Code - * Copyright (C) 1993-2014 Flat Rock Software - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -// -// ID Engine -// ID_US.h - Header file for the User Manager -// v1.0d1 -// By Jason Blochowiak -// -#ifndef __ID_US__ -#define __ID_US__ - -#include "lib_head.h" - -#ifdef __DEBUG__ -#define __DEBUG_UserMgr__ -#endif - -extern int US_CheckParm(char *parm,char **strings); - -#endif