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 84bcda1642cb0c1869bdf3d1ac448bc06415d9bc..c52affc15601a33918a9f39a50bd33d7c7d5a699 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/inputest.exe b/inputest.exe
index 76a53020ae068e104ea7beb7afeb22f1f43ef8da..5959b1caead423f9656ff038fd4145e4e99cb037 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index 081c585624cb590dc321a7f00af70dfa3ea7d882..973cf984c78940c8846f868a44419db16a6f05f3 100644 (file)
--- 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 52fdf8e9d385ddb3fec5c2b110713d1933dac320..b609f2e7dafb64efa47dd1a1337ba0b2428ac0c4 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1185,40 +1185,3 @@ void MM_BombOnError (boolean bomb)
 {\r
        mminfo.bombonerror = bomb;\r
 }\r
-\r
-//==========================================================================\r
-\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
-}\r

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 461d1b95cc7c4ef451bcaae2e34fa8a0dfe0bab5..6b1c535e366298d48667744b58363b69a18e3ac0 100644 (file)
--- 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);