Mercurial > mm7

comparison mm7_5.cpp @ 1104:5d5c78088274

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strcmpi to stricmp conversion
author Grumpy7
date Mon, 27 May 2013 21:37:14 +0200
parents 3e5d70cfe20e
children a1fd8045ffb1
comparison
equal deleted inserted replaced
1103:db395ce89ede 1104:5d5c78088274
1638 } 1638 }
1639 else 1639 else
1640 { 1640 {
1641 EventProcessor(dword_5C3418, 0, 1, dword_5C341C); 1641 EventProcessor(dword_5C3418, 0, 1, dword_5C341C);
1642 } 1642 }
1643 if ( !_strcmpi(byte_6BE3B0, "d05.blv") ) 1643 if ( !_stricmp(byte_6BE3B0, "d05.blv") )
1644 pParty->uTimePlayed += 1474560i64; 1644 pParty->uTimePlayed += 1474560i64;
1645 continue; 1645 continue;
1646 case UIMSG_TransitionWindowCloseBtn: 1646 case UIMSG_TransitionWindowCloseBtn:
1647 CloseWindowBackground(); 1647 CloseWindowBackground();
1648 pVideoPlayer->Unload(); 1648 pVideoPlayer->Unload();
1732 if ( Is_out15odm_underwater() ) 1732 if ( Is_out15odm_underwater() )
1733 { 1733 {
1734 bUnderwater = 1; 1734 bUnderwater = 1;
1735 pGame->uFlags2 |= 8u; 1735 pGame->uFlags2 |= 8u;
1736 } 1736 }
1737 if ( !_strcmpi(pCurrentMapName, "out15.odm") || !_strcmpi(pCurrentMapName, "d47.blv") ) 1737 if ( !_stricmp(pCurrentMapName, "out15.odm") || !_stricmp(pCurrentMapName, "d47.blv") )
1738 bNoNPCHiring = 1; 1738 bNoNPCHiring = 1;
1739 PrepareToLoadODM(1u, (OutdoorCamera *)1); 1739 PrepareToLoadODM(1u, (OutdoorCamera *)1);
1740 pAudioPlayer->SetMapEAX(); 1740 pAudioPlayer->SetMapEAX();
1741 bDialogueUI_InitializeActor_NPC_ID = 0; 1741 bDialogueUI_InitializeActor_NPC_ID = 0;
1742 OnMapLoad(); 1742 OnMapLoad();
2011 pPlayer9->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)sRecoveryTime * 2.133333333333333)); 2011 pPlayer9->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)sRecoveryTime * 2.133333333333333));
2012 } 2012 }
2013 pAudioPlayer->PlaySound((SoundID)word_4EE088_sound_ids[dword_506338], 0, 0, -1, 0, dword_50633C, 0, 0); 2013 pAudioPlayer->PlaySound((SoundID)word_4EE088_sound_ids[dword_506338], 0, 0, -1, 0, dword_50633C, 0, 0);
2014 if ( bRecallingBeacon ) 2014 if ( bRecallingBeacon )
2015 { 2015 {
2016 if ( _strcmpi(pCurrentMapName, (const char *)&pGames_LOD->pSubIndices[HIWORD(pNPCData4->uProfession)]) ) 2016 if ( _stricmp(pCurrentMapName, (const char *)&pGames_LOD->pSubIndices[HIWORD(pNPCData4->uProfession)]) )
2017 { 2017 {
2018 SaveGame(1, 0); 2018 SaveGame(1, 0);
2019 OnMapLeave(); 2019 OnMapLeave();
2020 strcpy(pCurrentMapName, (const char *)&pGames_LOD->pSubIndices[HIWORD(pNPCData4->uProfession)]); 2020 strcpy(pCurrentMapName, (const char *)&pGames_LOD->pSubIndices[HIWORD(pNPCData4->uProfession)]);
2021 dword_6BE364_game_settings_1 |= 1; 2021 dword_6BE364_game_settings_1 |= 1;
2067 LOWORD(pNPCData2->Location2D) = LOWORD(pParty->sRotationY); 2067 LOWORD(pNPCData2->Location2D) = LOWORD(pParty->sRotationY);
2068 HIWORD(pNPCData2->Location2D) = LOWORD(pParty->sRotationX); 2068 HIWORD(pNPCData2->Location2D) = LOWORD(pParty->sRotationX);
2069 if ( (signed int)pGames_LOD->uNumSubDirs / 2 <= 0 ) 2069 if ( (signed int)pGames_LOD->uNumSubDirs / 2 <= 0 )
2070 continue; 2070 continue;
2071 uAction = 0; 2071 uAction = 0;
2072 while ( _strcmpi((const char *)pGames_LOD->pSubIndices + uAction, pCurrentMapName) ) 2072 while ( _stricmp((const char *)pGames_LOD->pSubIndices + uAction, pCurrentMapName) )
2073 { 2073 {
2074 ++thisg; 2074 ++thisg;
2075 uAction += 32; 2075 uAction += 32;
2076 if ( thisg >= (signed int)pGames_LOD->uNumSubDirs / 2 ) 2076 if ( thisg >= (signed int)pGames_LOD->uNumSubDirs / 2 )
2077 continue; 2077 continue;
2286 if ( (signed int)pNPCData4 > 0 ) 2286 if ( (signed int)pNPCData4 > 0 )
2287 { 2287 {
2288 thish = 0; 2288 thish = 0;
2289 do 2289 do
2290 { 2290 {
2291 if ( !_strcmpi((const char *)&pGames_LOD->pSubIndices[thish], Str2) ) 2291 if ( !_stricmp((const char *)&pGames_LOD->pSubIndices[thish], Str2) )
2292 break; 2292 break;
2293 ++thish; 2293 ++thish;
2294 pNPCData3 = (NPCData *)((char *)pNPCData3 + 1); 2294 pNPCData3 = (NPCData *)((char *)pNPCData3 + 1);
2295 } 2295 }
2296 while ( (signed int)pNPCData3 < (signed int)pNPCData4 ); 2296 while ( (signed int)pNPCData3 < (signed int)pNPCData4 );
8780 8780
8781 v8 = 0; 8781 v8 = 0;
8782 v6 = 0; 8782 v6 = 0;
8783 v7 = 0; 8783 v7 = 0;
8784 v5 = 0; 8784 v5 = 0;
8785 if ( !_strcmpi(pCurrentMapName, "d25.blv") ) 8785 if ( !_stricmp(pCurrentMapName, "d25.blv") )
8786 v8 = 1; 8786 v8 = 1;
8787 if ( !_strcmpi(pCurrentMapName, "d26.blv") ) 8787 if ( !_stricmp(pCurrentMapName, "d26.blv") )
8788 v6 = 1; 8788 v6 = 1;
8789 if (_449B57_test_bit(pParty->_quest_bits, 99)) 8789 if (_449B57_test_bit(pParty->_quest_bits, 99))
8790 v7 = 1; 8790 v7 = 1;
8791 if (_449B57_test_bit(pParty->_quest_bits, 100)) 8791 if (_449B57_test_bit(pParty->_quest_bits, 100))
8792 v5 = 1; 8792 v5 = 1;
9471 const char **v3; // esi@2 9471 const char **v3; // esi@2
9472 char *v4; // ebx@2 9472 char *v4; // ebx@2
9473 9473
9474 v1 = a1; 9474 v1 = a1;
9475 v2 = 1; 9475 v2 = 1;
9476 if ( _strcmpi(pMapStats->pInfos[1].pFilename, (const char *)&pGames_LOD->pSubIndices[a1]) ) 9476 if ( _stricmp(pMapStats->pInfos[1].pFilename, (const char *)&pGames_LOD->pSubIndices[a1]) )
9477 { 9477 {
9478 v3 = (const char **)&pMapStats->pInfos[1].pFilename; 9478 v3 = (const char **)&pMapStats->pInfos[1].pFilename;
9479 v4 = (char *)&pMapStats->pInfos[1].pFilename; 9479 v4 = (char *)&pMapStats->pInfos[1].pFilename;
9480 do 9480 do
9481 { 9481 {
9483 break; 9483 break;
9484 v3 += 17; 9484 v3 += 17;
9485 ++v2; 9485 ++v2;
9486 v4 = (char *)v3; 9486 v4 = (char *)v3;
9487 } 9487 }
9488 while ( _strcmpi(*v3, (const char *)&pGames_LOD->pSubIndices[v1]) ); 9488 while ( _stricmp(*v3, (const char *)&pGames_LOD->pSubIndices[v1]) );
9489 } 9489 }
9490 return v2; 9490 return v2;
9491 } 9491 }
9492 9492
9493 //----- (00410DEC) -------------------------------------------------------- 9493 //----- (00410DEC) --------------------------------------------------------