X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=42a87440485b974a3b11baf23fb91f8c5119db73;hb=fb97121f7d0be4408d8e2ed98a2f7b10b852a915;hp=d40c40e35d4435454016cc938d0877ec1b3040a4;hpb=14c5716ee17d95f1c730de73ed462f95e8b41692;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index d40c40e3..42a87440 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -439,6 +439,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar) boolean MML_CheckForXMS(void) { + //numUMBs = 0; boolean errorflag=false; __asm { @@ -842,23 +843,9 @@ void MM_Startup(global_game_variables_t *gvar) // gvar->mmi.EMSmem = 0; //goto emsskip; //0000 - for(i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for(i = 1;i < _argc;i++) { - if(US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStringsexmm) == 0) + if(US_CheckParm(_argv[i],ParmStringsexmm) == 0) goto emsskip; // param NOEMS } if(MML_CheckForEMS()) @@ -878,23 +865,9 @@ void MM_Startup(global_game_variables_t *gvar) emsskip: gvar->mmi.XMSmem = 0; goto xmsskip;//0000 - for(i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for(i = 1;i < _argc;i++) { - if(US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStringsexmm) == 0) + if(US_CheckParm( _argv[i],ParmStringsexmm) == 0) goto xmsskip; // param NOXMS } if(MML_CheckForXMS()) @@ -937,16 +910,16 @@ void MM_Shutdown(global_game_variables_t *gvar) #ifdef __BORLANDC__ free(gvar->mm.nearheap);// printf(" near freed\n"); #endif +#ifndef __16_PM__ #ifdef __DEBUG__ if(!dbg_debugpm) { #endif -#ifndef __16_PM__ if(MML_CheckForEMS()){ MML_ShutdownEMS(gvar); }//printf(" EMS freed\n"); } if(MML_CheckForXMS()){ MML_ShutdownXMS(gvar); }//printf(" XMS freed\n"); } -#endif #ifdef __DEBUG__ } #endif +#endif } //==========================================================================