Mercurial > mm7
diff mm7_2.cpp @ 1104:5d5c78088274
strcmpi to stricmp conversion
author | Grumpy7 |
---|---|
date | Mon, 27 May 2013 21:37:14 +0200 |
parents | a19cdcaa36fe |
children | 39eaa6b00141 |
line wrap: on
line diff
--- a/mm7_2.cpp Mon May 27 21:30:40 2013 +0200 +++ b/mm7_2.cpp Mon May 27 21:37:14 2013 +0200 @@ -3484,7 +3484,7 @@ v9 = 2; for ( v2->pTextures[v2->sNumTextures].uFlags = 0; v9 < v21; ++v9 ) { - if ( !_strcmpi((&Str1)[4 * v9], "New") ) + if ( !_stricmp((&Str1)[4 * v9], "New") ) { v10 = (int)&v2->pTextures[v2->sNumTextures].uFlags; *(char *)v10 |= 2u; @@ -5736,25 +5736,25 @@ for ( j = 0; j < v41.uPropCount; ++j ) { v27 = v41.pProperties[j]; - if ( _strcmpi(v41.pProperties[j], "NBM") ) - { - if ( _strcmpi(v27, "Invisible") ) - { - if ( _strcmpi(v27, "FS") ) + if ( _stricmp(v41.pProperties[j], "NBM") ) + { + if ( _stricmp(v27, "Invisible") ) + { + if ( _stricmp(v27, "FS") ) { - if ( _strcmpi(v27, "FM") ) + if ( _stricmp(v27, "FM") ) { - if ( _strcmpi(v27, "FF") ) + if ( _stricmp(v27, "FF") ) { - if ( _strcmpi(v27, "Marker") ) + if ( _stricmp(v27, "Marker") ) { - if ( _strcmpi(v27, "LoopSlow") ) + if ( _stricmp(v27, "LoopSlow") ) { - if ( _strcmpi(v27, "EmitFire") ) + if ( _stricmp(v27, "EmitFire") ) { - if ( _strcmpi(v27, "Dawn") ) + if ( _stricmp(v27, "Dawn") ) { - if ( !_strcmpi(v27, "Dusk") ) + if ( !_stricmp(v27, "Dusk") ) HIBYTE(v2->pDecorations[v2->uNumDecorations].uFlags) |= 2u; } else @@ -5966,17 +5966,17 @@ { v21 = Argsb; v22 = v44.pProperties[Argsb]; - if ( !_strcmpi(v44.pProperties[Argsb], "NoDraw") ) + if ( !_stricmp(v44.pProperties[Argsb], "NoDraw") ) { v23 = (int)&v2->pObjects[v2->uNumObjects].uFlags; *(char *)v23 |= 1u; } - if ( !_strcmpi(v22, "Lifetime") ) + if ( !_stricmp(v22, "Lifetime") ) { v24 = (int)&v2->pObjects[v2->uNumObjects].uFlags; *(char *)v24 |= 4u; } - if ( !_strcmpi(v22, "FTLifetime") ) + if ( !_stricmp(v22, "FTLifetime") ) { v25 = (int)&v2->pObjects[v2->uNumObjects]; *(short *)(v25 + 42) = 8 * pSpriteFrameTable->pSpriteSFrames[*(short *)(v25 + 40)].uAnimLength; @@ -5985,32 +5985,32 @@ v27 = (int)&v2->pObjects[v2->uNumObjects].uFlags; *(char *)v27 |= 4u; } - if ( !_strcmpi(v22, "NoPickup") ) + if ( !_stricmp(v22, "NoPickup") ) { v28 = (int)&v2->pObjects[v2->uNumObjects].uFlags; *(char *)v28 |= 0x10u; } - if ( !_strcmpi(v22, "NoGravity") ) + if ( !_stricmp(v22, "NoGravity") ) { v29 = (int)&v2->pObjects[v2->uNumObjects].uFlags; *(char *)v29 |= 0x20u; } - if ( !_strcmpi(v22, "FlagOnIntercept") ) + if ( !_stricmp(v22, "FlagOnIntercept") ) { v30 = (int)&v2->pObjects[v2->uNumObjects].uFlags; *(char *)v30 |= 0x40u; } - if ( !_strcmpi(v22, "Bounce") ) + if ( !_stricmp(v22, "Bounce") ) { v31 = (int)&v2->pObjects[v2->uNumObjects].uFlags; *(char *)v31 |= 0x80u; } v32 = v45.pProperties[v21]; - if ( !_strcmpi(v45.pProperties[v21], "Fire") ) + if ( !_stricmp(v45.pProperties[v21], "Fire") ) HIBYTE(v2->pObjects[v2->uNumObjects].uFlags) |= 2u; - if ( !_strcmpi(v32, "Lines") ) + if ( !_stricmp(v32, "Lines") ) HIBYTE(v2->pObjects[v2->uNumObjects].uFlags) |= 4u; - if ( !_strcmpi(v44.pProperties[v21], "bits") ) + if ( !_stricmp(v44.pProperties[v21], "bits") ) { v33 = v44.pProperties[v21 + 1]; v34 = (int)&v2->pObjects[v2->uNumObjects].uFlags; @@ -7967,7 +7967,7 @@ //----- (00464839) -------------------------------------------------------- char __cdecl Is_out15odm_underwater() { - return _strcmpi(pCurrentMapName, "out15.odm") == 0; + return _stricmp(pCurrentMapName, "out15.odm") == 0; } //----- (00464851) -------------------------------------------------------- @@ -8011,19 +8011,19 @@ bUnderwater = 0; uLevelMapStatsID = v5; pGame->uFlags2 &= 0xFFFFFFF7u; - if ( !_strcmpi(pCurrentMapName, "out15.odm") ) + if ( !_stricmp(pCurrentMapName, "out15.odm") ) { bUnderwater = 1; pGame->uFlags2 |= 8u; } pParty->floor_face_pid = 0; - if ( _strcmpi(Str1, "blv") ) + if ( _stricmp(Str1, "blv") ) PrepareToLoadODM(v9, 0); else PrepareToLoadBLV(v9); pAudioPlayer->SetMapEAX(); sub_461103(); - if ( !_strcmpi(pCurrentMapName, "d11.blv") || !_strcmpi(pCurrentMapName, "d10.blv") ) + if ( !_stricmp(pCurrentMapName, "d11.blv") || !_stricmp(pCurrentMapName, "d10.blv") ) { //spawning grounds & good analogue - no loot & exp from monsters