Mercurial > mm7
diff mm7_5.cpp @ 1104:5d5c78088274
strcmpi to stricmp conversion
author | Grumpy7 |
---|---|
date | Mon, 27 May 2013 21:37:14 +0200 |
parents | 3e5d70cfe20e |
children | a1fd8045ffb1 |
line wrap: on
line diff
--- a/mm7_5.cpp Mon May 27 21:30:40 2013 +0200 +++ b/mm7_5.cpp Mon May 27 21:37:14 2013 +0200 @@ -1640,7 +1640,7 @@ { EventProcessor(dword_5C3418, 0, 1, dword_5C341C); } - if ( !_strcmpi(byte_6BE3B0, "d05.blv") ) + if ( !_stricmp(byte_6BE3B0, "d05.blv") ) pParty->uTimePlayed += 1474560i64; continue; case UIMSG_TransitionWindowCloseBtn: @@ -1734,7 +1734,7 @@ bUnderwater = 1; pGame->uFlags2 |= 8u; } - if ( !_strcmpi(pCurrentMapName, "out15.odm") || !_strcmpi(pCurrentMapName, "d47.blv") ) + if ( !_stricmp(pCurrentMapName, "out15.odm") || !_stricmp(pCurrentMapName, "d47.blv") ) bNoNPCHiring = 1; PrepareToLoadODM(1u, (OutdoorCamera *)1); pAudioPlayer->SetMapEAX(); @@ -2013,7 +2013,7 @@ pAudioPlayer->PlaySound((SoundID)word_4EE088_sound_ids[dword_506338], 0, 0, -1, 0, dword_50633C, 0, 0); if ( bRecallingBeacon ) { - if ( _strcmpi(pCurrentMapName, (const char *)&pGames_LOD->pSubIndices[HIWORD(pNPCData4->uProfession)]) ) + if ( _stricmp(pCurrentMapName, (const char *)&pGames_LOD->pSubIndices[HIWORD(pNPCData4->uProfession)]) ) { SaveGame(1, 0); OnMapLeave(); @@ -2069,7 +2069,7 @@ if ( (signed int)pGames_LOD->uNumSubDirs / 2 <= 0 ) continue; uAction = 0; - while ( _strcmpi((const char *)pGames_LOD->pSubIndices + uAction, pCurrentMapName) ) + while ( _stricmp((const char *)pGames_LOD->pSubIndices + uAction, pCurrentMapName) ) { ++thisg; uAction += 32; @@ -2288,7 +2288,7 @@ thish = 0; do { - if ( !_strcmpi((const char *)&pGames_LOD->pSubIndices[thish], Str2) ) + if ( !_stricmp((const char *)&pGames_LOD->pSubIndices[thish], Str2) ) break; ++thish; pNPCData3 = (NPCData *)((char *)pNPCData3 + 1); @@ -8782,9 +8782,9 @@ v6 = 0; v7 = 0; v5 = 0; - if ( !_strcmpi(pCurrentMapName, "d25.blv") ) + if ( !_stricmp(pCurrentMapName, "d25.blv") ) v8 = 1; - if ( !_strcmpi(pCurrentMapName, "d26.blv") ) + if ( !_stricmp(pCurrentMapName, "d26.blv") ) v6 = 1; if (_449B57_test_bit(pParty->_quest_bits, 99)) v7 = 1; @@ -9473,7 +9473,7 @@ v1 = a1; v2 = 1; - if ( _strcmpi(pMapStats->pInfos[1].pFilename, (const char *)&pGames_LOD->pSubIndices[a1]) ) + if ( _stricmp(pMapStats->pInfos[1].pFilename, (const char *)&pGames_LOD->pSubIndices[a1]) ) { v3 = (const char **)&pMapStats->pInfos[1].pFilename; v4 = (char *)&pMapStats->pInfos[1].pFilename; @@ -9485,7 +9485,7 @@ ++v2; v4 = (char *)v3; } - while ( _strcmpi(*v3, (const char *)&pGames_LOD->pSubIndices[v1]) ); + while ( _stricmp(*v3, (const char *)&pGames_LOD->pSubIndices[v1]) ); } return v2; }