From: sparky4 Date: Tue, 30 Jun 2015 18:37:11 +0000 (-0500) Subject: renamed: 16/misc/emmtest.exe -> 16/emmo/emmtest.exe X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=f4e34c1b65530dd69c17cac12fee72337d8a256e;p=16.git renamed: 16/misc/emmtest.exe -> 16/emmo/emmtest.exe renamed: 16/misc/emsdump.exe -> 16/emmo/emsdump.exe renamed: 16/misc/maptest0.exe -> 16/emmo/maptest0.exe modified: exmmtest.exe modified: inputest.exe modified: makefile modified: src/lib/16_mm.c modified: src/lib/16_mm.h --- diff --git a/16/misc/emmtest.exe b/16/emmo/emmtest.exe similarity index 100% rename from 16/misc/emmtest.exe rename to 16/emmo/emmtest.exe diff --git a/16/misc/emsdump.exe b/16/emmo/emsdump.exe similarity index 100% rename from 16/misc/emsdump.exe rename to 16/emmo/emsdump.exe diff --git a/16/misc/maptest0.exe b/16/emmo/maptest0.exe similarity index 100% rename from 16/misc/maptest0.exe rename to 16/emmo/maptest0.exe diff --git a/exmmtest.exe b/exmmtest.exe index 84bcda16..c52affc1 100644 Binary files a/exmmtest.exe and b/exmmtest.exe differ diff --git a/inputest.exe b/inputest.exe index 76a53020..5959b1ca 100644 Binary files a/inputest.exe and b/inputest.exe differ diff --git a/makefile b/makefile index 081c5856..973cf984 100644 --- a/makefile +++ b/makefile @@ -13,7 +13,7 @@ TARGET_OS = dos #-zkl = current codepage #MFLAGS=-mc# -zm -CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq +CFLAGS=-zkl -wo -x -mc# -zdp# -zp16 -zq OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+ FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) SRC=src$(DIRSEP) diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 52fdf8e9..b609f2e7 100644 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -1185,40 +1185,3 @@ void MM_BombOnError (boolean bomb) { mminfo.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 461d1b95..6b1c535e 100644 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -168,7 +168,6 @@ static unsigned numUMBs,UMBbase[MAXUMBS];*/ void MM_Startup (void); void MM_Shutdown (void); -void MM_MapEMS (void); void MM_GetPtr (memptr *baseptr,dword size); void MM_FreePtr (memptr *baseptr);