Mercurial > mm7
changeset 1104:5d5c78088274
strcmpi to stricmp conversion
| author | Grumpy7 |
|---|---|
| date | Mon, 27 May 2013 21:37:14 +0200 |
| parents | db395ce89ede |
| children | 3b3a0e9aeace |
| files | AudioPlayer.cpp Events.cpp Game.cpp Indoor.cpp Items.cpp LOD.cpp Monsters.cpp Mouse.cpp NPC.cpp Outdoor.cpp Overlays.cpp SaveLoad.cpp Spells.cpp Sprites.cpp Texture.cpp TileTable.cpp UIHouses.cpp UIRest.cpp UISaveLoad.cpp UiGame.cpp VideoPlayer.cpp mm7_2.cpp mm7_3.cpp mm7_4.cpp mm7_5.cpp mm7_6.cpp |
| diffstat | 26 files changed, 318 insertions(+), 318 deletions(-) [+] |
line wrap: on
line diff
--- a/AudioPlayer.cpp Mon May 27 21:30:40 2013 +0200 +++ b/AudioPlayer.cpp Mon May 27 21:37:14 2013 +0200 @@ -267,7 +267,7 @@ return 0; } v12 = 0; - while ( _strcmpi(pAudioPlayer->pSoundHeaders[v12].pSoundName, v11->pSoundName) ) + while ( _stricmp(pAudioPlayer->pSoundHeaders[v12].pSoundName, v11->pSoundName) ) { ++v7; ++v12; @@ -488,11 +488,11 @@ v9 = atoi(v19.pProperties[1]); v10 = v19.pProperties[2]; v2->pSounds[v2->sNumSounds].uSoundID = v9; - if ( _strcmpi(v10, "system") ) + if ( _stricmp(v10, "system") ) { - if ( _strcmpi(v19.pProperties[2], "swap") ) + if ( _stricmp(v19.pProperties[2], "swap") ) { - v11 = _strcmpi(v19.pProperties[2], "lock"); + v11 = _stricmp(v19.pProperties[2], "lock"); v12 = v2->pSounds; v13 = v11 == 0; v14 = v2->sNumSounds; @@ -510,7 +510,7 @@ { v2->pSounds[v2->sNumSounds].eType = SOUND_DESC_SYSTEM; } - if ( v19.uPropCount >= 4 && !_strcmpi(v19.pProperties[3], "3D") ) + if ( v19.uPropCount >= 4 && !_stricmp(v19.pProperties[3], "3D") ) { v15 = (int)&v2->pSounds[v2->sNumSounds].uFlags; *(int *)v15 |= SOUND_DESC_SWAP; @@ -2576,7 +2576,7 @@ result = &pAudioPlayer->pSoundHeaders[v6 / 2 + v4]; if ( !result ) return result; - result = (SoundHeader *)_strcmpi(pName, result->pSoundName); + result = (SoundHeader *)_stricmp(pName, result->pSoundName); if ( !result ) uFindSound_BinSearch_ResultID = v6 / 2 + v4; if ( v4 == v10 ) @@ -2591,7 +2591,7 @@ v9 = v4; do { - result = (SoundHeader *)_strcmpi(pName, pAudioPlayer->pSoundHeaders[v9].pSoundName); + result = (SoundHeader *)_stricmp(pName, pAudioPlayer->pSoundHeaders[v9].pSoundName); if ( !result ) goto LABEL_24; ++v7; @@ -2618,7 +2618,7 @@ v8 = v4; while ( 1 ) { - result = (SoundHeader *)_strcmpi(pName, pAudioPlayer->pSoundHeaders[v8].pSoundName); + result = (SoundHeader *)_stricmp(pName, pAudioPlayer->pSoundHeaders[v8].pSoundName); if ( !result ) break; ++v7;
--- a/Events.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Events.cpp Mon May 27 21:37:14 2013 +0200 @@ -497,7 +497,7 @@ strcpy(Str, Source); v16 = RemoveQuotes(Str); VideoPlayer::MovieLoop(v16, 0, v14, 1); - if ( !_strcmpi(v16, "arbiter good") ) + if ( !_stricmp(v16, "arbiter good") ) { pParty->alignment = PartyAlignment_Good; v18 = 0; @@ -519,7 +519,7 @@ //v7 = ""; break; } - if ( !_strcmpi(v16, "arbiter evil") ) + if ( !_stricmp(v16, "arbiter evil") ) { v18 = 2; pParty->alignment = PartyAlignment_Evil; @@ -541,7 +541,7 @@ break; } - if ( !_strcmpi(v16, "pcout01") ) // moving to harmondale from emerald isle + if ( !_stricmp(v16, "pcout01") ) // moving to harmondale from emerald isle { Rest(0x2760u); pParty->RestAndHeal(); @@ -1115,8 +1115,8 @@ return; } v84 = _evt->v13 + ((_evt->v14 + ((_evt->v15 + ((uint)_evt->v16 << 8)) << 8)) << 8); - if ( !_strcmpi(GameUI_Footer_TimedString, &pLevelStr[pLevelStrOffsets[_evt->v9 + ((_evt->v10 + ((_evt->v11 + ((uint)_evt->v12 << 8)) << 8)) << 8)]]) - || !_strcmpi(GameUI_Footer_TimedString, &pLevelStr[pLevelStrOffsets[v84]]) ) + if ( !_stricmp(GameUI_Footer_TimedString, &pLevelStr[pLevelStrOffsets[_evt->v9 + ((_evt->v10 + ((_evt->v11 + ((uint)_evt->v12 << 8)) << 8)) << 8)]]) + || !_stricmp(GameUI_Footer_TimedString, &pLevelStr[pLevelStrOffsets[v84]]) ) { v11 = _evt->v17; LABEL_130:
--- a/Game.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Game.cpp Mon May 27 21:37:14 2013 +0200 @@ -510,7 +510,7 @@ pParty->uFallSpeed = 0; pParty->field_6E4 = 0; pParty->field_6E0 = 0; - if ( _strcmpi(Source, pCurrentMapName) ) + if ( _stricmp(Source, pCurrentMapName) ) { strcpy(pCurrentMapName, Source); _5B65A8_npcdata_uflags_or_other = pParty->vPosition.x;
--- a/Indoor.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Indoor.cpp Mon May 27 21:37:14 2013 +0200 @@ -4316,7 +4316,7 @@ bUnderwater = 1; pGame->uFlags2 |= 8u; } - if ( !_strcmpi(pCurrentMapName, "out15.odm") || !_strcmpi(pCurrentMapName, "d23.blv") ) + if ( !_stricmp(pCurrentMapName, "out15.odm") || !_stricmp(pCurrentMapName, "d23.blv") ) bNoNPCHiring = 1; pPaletteManager->pPalette_tintColor[0] = 0; pPaletteManager->pPalette_tintColor[1] = 0;
--- a/Items.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Items.cpp Mon May 27 21:37:14 2013 +0200 @@ -544,107 +544,107 @@ break; case 4: //Equip Stat { - if ( !_strcmpi(test_string, "weapon") ) + if ( !_stricmp(test_string, "weapon") ) { pItems[item_counter].uEquipType = EQUIP_OFF_HAND; break; } - if ( !_strcmpi(test_string, "weapon2") ) + if ( !_stricmp(test_string, "weapon2") ) { pItems[item_counter].uEquipType = EQUIP_MAIN_HAND; break; } - if ( !_strcmpi(test_string, "weapon1or2") ) + if ( !_stricmp(test_string, "weapon1or2") ) { pItems[item_counter].uEquipType = EQUIP_OFF_HAND; break; } - if ( !(_strcmpi(test_string, "missile")&&_strcmpi(test_string, "bow"))) + if ( !(_stricmp(test_string, "missile")&&_stricmp(test_string, "bow"))) { pItems[item_counter].uEquipType = EQUIP_BOW; break; } - if ( !_strcmpi(test_string, "armor") ) + if ( !_stricmp(test_string, "armor") ) { pItems[item_counter].uEquipType = EQUIP_ARMOUR; break; } - if ( !_strcmpi(test_string, "shield") ) + if ( !_stricmp(test_string, "shield") ) { pItems[item_counter].uEquipType = EQUIP_SHIELD; break; } - if ( !_strcmpi(test_string, "helm") ) + if ( !_stricmp(test_string, "helm") ) { pItems[item_counter].uEquipType = EQUIP_HELMET; break; } - if ( !_strcmpi(test_string, "belt") ) + if ( !_stricmp(test_string, "belt") ) { pItems[item_counter].uEquipType = EQUIP_BELT; break; } - if ( !_strcmpi(test_string, "cloak") ) + if ( !_stricmp(test_string, "cloak") ) { pItems[item_counter].uEquipType = EQUIP_CLOAK; break; } - if ( !_strcmpi(test_string, "gauntlets") ) + if ( !_stricmp(test_string, "gauntlets") ) { pItems[item_counter].uEquipType = EQUIP_GAUNTLETS; break; } - if ( !_strcmpi(test_string, "boots") ) + if ( !_stricmp(test_string, "boots") ) { pItems[item_counter].uEquipType = EQUIP_BOOTS; break; } - if ( !_strcmpi(test_string, "ring") ) + if ( !_stricmp(test_string, "ring") ) { pItems[item_counter].uEquipType = EQUIP_RING; break; } - if ( !_strcmpi(test_string, "amulet") ) + if ( !_stricmp(test_string, "amulet") ) { pItems[item_counter].uEquipType = EQUIP_AMULET; break; } - if ( !_strcmpi(test_string, "weaponw") ) + if ( !_stricmp(test_string, "weaponw") ) { pItems[item_counter].uEquipType = EQUIP_WAND; break; } - if ( !(_strcmpi(test_string, "herb")&&_strcmpi(test_string, "reagent"))) + if ( !(_stricmp(test_string, "herb")&&_stricmp(test_string, "reagent"))) { pItems[item_counter].uEquipType = EQUIP_REAGENT; break; } - if ( !_strcmpi(test_string, "bottle") ) + if ( !_stricmp(test_string, "bottle") ) { pItems[item_counter].uEquipType = EQUIP_POTION; break; } - if ( !_strcmpi(test_string, "sscroll") ) + if ( !_stricmp(test_string, "sscroll") ) { pItems[item_counter].uEquipType = EQUIP_SPELL_SCROLL; break; } - if ( !_strcmpi(test_string, "book") ) + if ( !_stricmp(test_string, "book") ) { pItems[item_counter].uEquipType = EQUIP_BOOK; break; } - if ( !_strcmpi(test_string, "mscroll") ) + if ( !_stricmp(test_string, "mscroll") ) { pItems[item_counter].uEquipType = EQUIP_MESSAGE_SCROLL; break; } - if ( !_strcmpi(test_string, "gold") ) + if ( !_stricmp(test_string, "gold") ) { pItems[item_counter].uEquipType = EQUIP_GOLD; break; } - if ( !_strcmpi(test_string, "gem") ) + if ( !_stricmp(test_string, "gem") ) { pItems[item_counter].uEquipType = EQUIP_GEM; break; @@ -654,67 +654,67 @@ } case 5: //Skill Group { - if ( !_strcmpi(test_string, "staff") ) + if ( !_stricmp(test_string, "staff") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_STAFF; break; } - if ( !_strcmpi(test_string, "sword") ) + if ( !_stricmp(test_string, "sword") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_SWORD; break; } - if ( !_strcmpi(test_string, "dagger") ) + if ( !_stricmp(test_string, "dagger") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_DAGGER; break; } - if ( !_strcmpi(test_string, "axe") ) + if ( !_stricmp(test_string, "axe") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_AXE; break; } - if ( !_strcmpi(test_string, "spear") ) + if ( !_stricmp(test_string, "spear") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_SPEAR; break; } - if ( !_strcmpi(test_string, "bow") ) + if ( !_stricmp(test_string, "bow") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_BOW; break; } - if ( !_strcmpi(test_string, "mace") ) + if ( !_stricmp(test_string, "mace") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_MACE; break; } - if ( !_strcmpi(test_string, "blaster") ) + if ( !_stricmp(test_string, "blaster") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_BLASTER; break; } - if ( !_strcmpi(test_string, "shield") ) + if ( !_stricmp(test_string, "shield") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_SHIELD; break; } - if ( !_strcmpi(test_string, "leather") ) + if ( !_stricmp(test_string, "leather") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_LEATHER; break; } - if ( !_strcmpi(test_string, "chain") ) + if ( !_stricmp(test_string, "chain") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_CHAIN; break; } - if ( !_strcmpi(test_string, "plate") ) + if ( !_stricmp(test_string, "plate") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_PLATE; break; } - if ( !_strcmpi(test_string, "club") ) + if ( !_stricmp(test_string, "club") ) { pItems[item_counter].uSkillType = PLAYER_SKILL_CLUB; break; @@ -756,17 +756,17 @@ break; case 8: //material { - if ( !_strcmpi(test_string, "artifact") ) + if ( !_stricmp(test_string, "artifact") ) { pItems[item_counter].uMaterial = MATERIAL_ARTEFACT; break; } - if ( !_strcmpi(test_string, "relic") ) + if ( !_stricmp(test_string, "relic") ) { pItems[item_counter].uMaterial = MATERIAL_RELIC; break; } - if ( !_strcmpi(test_string, "special") ) + if ( !_stricmp(test_string, "special") ) { pItems[item_counter].uMaterial = MATERIAL_SPECIAL; break;
--- a/LOD.cpp Mon May 27 21:30:40 2013 +0200 +++ b/LOD.cpp Mon May 27 21:37:14 2013 +0200 @@ -279,7 +279,7 @@ { for (i=0; i<uNumLoadedSprites;++i) { - if (!(_strcmpi(pHardwareSprites[i].pName, pContainerName))) + if (!(_stricmp(pHardwareSprites[i].pName, pContainerName))) return i; } } @@ -287,7 +287,7 @@ { for (i=0; i<uNumLoadedSprites;++i) { - if (!(_strcmpi(pSpriteHeaders[i].pName, pContainerName))) + if (!(_stricmp(pSpriteHeaders[i].pName, pContainerName))) return i; } } @@ -340,7 +340,7 @@ { for (i=0; i<uNumLoadedSprites;++i) { - if (!(_strcmpi(pSpriteHeaders[i].pName, "pending"))) + if (!(_stricmp(pSpriteHeaders[i].pName, "pending"))) return i; } } @@ -1223,7 +1223,7 @@ else { v4 = this->pTextures; - while ( _strcmpi(v4->pName, pName) ) + while ( _stricmp(v4->pName, pName) ) { ++v3; ++v4; @@ -1899,7 +1899,7 @@ while ( 1 ) { v5 = maxIndex - v4; - result = _strcmpi((const char *)pContainerName, (const char *)(&v10->pSubIndices[(maxIndex - v4) / 2] + v4)); + result = _stricmp((const char *)pContainerName, (const char *)(&v10->pSubIndices[(maxIndex - v4) / 2] + v4)); if ( !result ) _6A0CA4_lod_binary_search = (maxIndex - v4) / 2 + v4; if ( v4 == maxIndex ) @@ -1914,7 +1914,7 @@ v9 = v4; do { - result = _strcmpi((const char *)pContainerName, (const char *)&v10->pSubIndices[v9]); + result = _stricmp((const char *)pContainerName, (const char *)&v10->pSubIndices[v9]); if ( !result ) goto LABEL_21; ++v7; @@ -1938,7 +1938,7 @@ v8 = v4; while ( 1 ) { - result = _strcmpi((const char *)pContainerName, (const char *)&v10->pSubIndices[v8]); + result = _stricmp((const char *)pContainerName, (const char *)&v10->pSubIndices[v8]); if ( !result ) break; ++v7; @@ -1971,7 +1971,7 @@ } else { - while ( _strcmpi((const char *)pContainer, (const char *)&this_dup->pSubIndices[i]) ) + while ( _stricmp((const char *)pContainer, (const char *)&this_dup->pSubIndices[i]) ) { ++i_dup; ++i; @@ -2917,7 +2917,7 @@ if (uNumLoadedFiles > 0) { Sourcea = (const char *)pTextures; - while ( _strcmpi(Sourcea, "pending") ) + while ( _stricmp(Sourcea, "pending") ) { Sourcea += 72; ++v6; @@ -2934,7 +2934,7 @@ return uNumLoadedFiles - 1; // } // v5 = pTextures; -// while ( _strcmpi(v5->pName, pContainer) ) +// while ( _stricmp(v5->pName, pContainer) ) // { // ++v4; // ++v5;
--- a/Monsters.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Monsters.cpp Mon May 27 21:37:14 2013 +0200 @@ -32,135 +32,135 @@ ++*next_token; return 0; } - if ( !_strcmpi(tbl->pProperties[0], "Dispel") ) //dispel magic + if ( !_stricmp(tbl->pProperties[0], "Dispel") ) //dispel magic { ++*next_token; return 80; } - else if ( !_strcmpi(tbl->pProperties[0], "Day") ) //day of protection + else if ( !_stricmp(tbl->pProperties[0], "Day") ) //day of protection { *next_token+=2;; return 85; } - else if ( !_strcmpi(tbl->pProperties[0], "Hour") ) //hour of power + else if ( !_stricmp(tbl->pProperties[0], "Hour") ) //hour of power { *next_token+=2;; return 86; } - else if ( !_strcmpi(tbl->pProperties[0], "Shield") ) + else if ( !_stricmp(tbl->pProperties[0], "Shield") ) return 17; - else if ( !_strcmpi(tbl->pProperties[0], "Spirit") ) + else if ( !_stricmp(tbl->pProperties[0], "Spirit") ) { ++*next_token; return 52; } - else if ( !_strcmpi(tbl->pProperties[0], "Power") ) //power cure + else if ( !_stricmp(tbl->pProperties[0], "Power") ) //power cure { ++*next_token; return 77; } - else if ( !_strcmpi(tbl->pProperties[0], "Meteor") ) //meteot shower + else if ( !_stricmp(tbl->pProperties[0], "Meteor") ) //meteot shower { ++*next_token; return 9; } - else if ( !_strcmpi(tbl->pProperties[0], "Lightning") ) //Lightning bolt + else if ( !_stricmp(tbl->pProperties[0], "Lightning") ) //Lightning bolt { ++*next_token; return 18; } - else if ( !_strcmpi(tbl->pProperties[0], "Implosion") ) + else if ( !_stricmp(tbl->pProperties[0], "Implosion") ) return 20; - else if ( !_strcmpi(tbl->pProperties[0], "Stone") ) + else if ( !_stricmp(tbl->pProperties[0], "Stone") ) { ++*next_token; return 38; } - else if ( !_strcmpi(tbl->pProperties[0], "Haste") ) + else if ( !_stricmp(tbl->pProperties[0], "Haste") ) return 5; - else if ( !_strcmpi(tbl->pProperties[0], "Heroism") ) + else if ( !_stricmp(tbl->pProperties[0], "Heroism") ) return 51; - else if ( !_strcmpi(tbl->pProperties[0], "Pain") ) //pain reflection + else if ( !_stricmp(tbl->pProperties[0], "Pain") ) //pain reflection { ++*next_token; return 95; } - else if ( !_strcmpi(tbl->pProperties[0], "Sparks") ) + else if ( !_stricmp(tbl->pProperties[0], "Sparks") ) return 15; - else if ( !_strcmpi(tbl->pProperties[0], "Light") ) + else if ( !_stricmp(tbl->pProperties[0], "Light") ) { ++*next_token; return 78; } - else if ( !_strcmpi(tbl->pProperties[0], "Toxic") ) //toxic cloud + else if ( !_stricmp(tbl->pProperties[0], "Toxic") ) //toxic cloud { ++*next_token; return 90; } - else if ( !_strcmpi(tbl->pProperties[0], "ShrapMetal") ) + else if ( !_stricmp(tbl->pProperties[0], "ShrapMetal") ) return 93; - else if ( !_strcmpi(tbl->pProperties[0], "Paralyze") ) + else if ( !_stricmp(tbl->pProperties[0], "Paralyze") ) return 81; - else if ( !_strcmpi(tbl->pProperties[0], "Fireball") ) + else if ( !_stricmp(tbl->pProperties[0], "Fireball") ) return 6; - else if ( !_strcmpi(tbl->pProperties[0], "Incinerate") ) + else if ( !_stricmp(tbl->pProperties[0], "Incinerate") ) return 11; - else if ( !_strcmpi(tbl->pProperties[0], "Fire") ) + else if ( !_stricmp(tbl->pProperties[0], "Fire") ) { ++*next_token; return 2; } - else if ( !_strcmpi(tbl->pProperties[0], "Rock") ) + else if ( !_stricmp(tbl->pProperties[0], "Rock") ) { ++*next_token; return 41; } - else if ( !_strcmpi(tbl->pProperties[0], "Mass") ) + else if ( !_stricmp(tbl->pProperties[0], "Mass") ) { ++*next_token; return 44; } - else if ( !_strcmpi(tbl->pProperties[0], "Ice") ) + else if ( !_stricmp(tbl->pProperties[0], "Ice") ) { ++*next_token; return 26; } - else if ( !_strcmpi(tbl->pProperties[0], "Acid") ) + else if ( !_stricmp(tbl->pProperties[0], "Acid") ) { ++*next_token; return 29; } - else if ( !_strcmpi(tbl->pProperties[0], "Bless") ) + else if ( !_stricmp(tbl->pProperties[0], "Bless") ) return 46; - else if ( !_strcmpi(tbl->pProperties[0], "Dragon") ) + else if ( !_stricmp(tbl->pProperties[0], "Dragon") ) { ++*next_token; return 97; } - else if ( !_strcmpi(tbl->pProperties[0], "Reanimate") ) + else if ( !_stricmp(tbl->pProperties[0], "Reanimate") ) return 89; - else if ( !_strcmpi(tbl->pProperties[0], "Summon") ) + else if ( !_stricmp(tbl->pProperties[0], "Summon") ) { ++*next_token; return 82; } - else if ( !_strcmpi(tbl->pProperties[0], "Fate") ) + else if ( !_stricmp(tbl->pProperties[0], "Fate") ) return 47; - else if ( !_strcmpi(tbl->pProperties[0], "Harm") ) + else if ( !_stricmp(tbl->pProperties[0], "Harm") ) return 70; - else if ( !_strcmpi(tbl->pProperties[0], "Mind") ) + else if ( !_stricmp(tbl->pProperties[0], "Mind") ) { ++*next_token; return 57; } - else if ( !_strcmpi(tbl->pProperties[0], "Blades") ) + else if ( !_stricmp(tbl->pProperties[0], "Blades") ) return 39; - else if ( !_strcmpi(tbl->pProperties[0], "Psychic") ) + else if ( !_stricmp(tbl->pProperties[0], "Psychic") ) { ++*next_token; return 65; } - else if ( !_strcmpi(tbl->pProperties[0], "Hammerhands") ) + else if ( !_stricmp(tbl->pProperties[0], "Hammerhands") ) return 73; else { @@ -233,29 +233,29 @@ //----- (00454E3A) -------------------------------------------------------- int ParseMissleAttackType(const char *missle_attack_str) { - if ( !_strcmpi(missle_attack_str, "ARROW") ) + if ( !_stricmp(missle_attack_str, "ARROW") ) return 1; - else if ( !_strcmpi(missle_attack_str, "ARROWF") ) + else if ( !_stricmp(missle_attack_str, "ARROWF") ) return 2; - else if ( !_strcmpi(missle_attack_str, "FIRE") ) + else if ( !_stricmp(missle_attack_str, "FIRE") ) return 3; - else if ( !_strcmpi(missle_attack_str, "AIR") ) + else if ( !_stricmp(missle_attack_str, "AIR") ) return 4; - else if ( !_strcmpi(missle_attack_str, "WATER") ) + else if ( !_stricmp(missle_attack_str, "WATER") ) return 5; - else if ( !_strcmpi(missle_attack_str, "EARTH") ) + else if ( !_stricmp(missle_attack_str, "EARTH") ) return 6; - else if ( !_strcmpi(missle_attack_str, "SPIRIT") ) + else if ( !_stricmp(missle_attack_str, "SPIRIT") ) return 7; - else if ( !_strcmpi(missle_attack_str, "MIND") ) + else if ( !_stricmp(missle_attack_str, "MIND") ) return 8; - else if ( !_strcmpi(missle_attack_str, "BODY") ) + else if ( !_stricmp(missle_attack_str, "BODY") ) return 9; - else if ( !_strcmpi(missle_attack_str, "LIGHT") ) + else if ( !_stricmp(missle_attack_str, "LIGHT") ) return 10; - else if ( !_strcmpi(missle_attack_str, "DARK") ) + else if ( !_stricmp(missle_attack_str, "DARK") ) return 11; - else if ( !_strcmpi(missle_attack_str, "ENER") ) + else if ( !_stricmp(missle_attack_str, "ENER") ) return 13; else return 0; } @@ -482,7 +482,7 @@ { for (int i=1; i<uNumMonsters; ++i) { - if((pInfos[i].pName )&& (!_strcmpi(pInfos[i].pPictureName, monster_textr_name))) + if((pInfos[i].pName )&& (!_stricmp(pInfos[i].pPictureName, monster_textr_name))) return i; } return -1; @@ -723,55 +723,55 @@ item_name=&test_string[str_pos+2]; if (*item_name) { - if ( !_strcmpi(item_name, "WEAPON")) + if ( !_stricmp(item_name, "WEAPON")) pInfos[curr_rec_num].uTreasureType= 20; - else if ( !_strcmpi(item_name, "ARMOR")) + else if ( !_stricmp(item_name, "ARMOR")) pInfos[curr_rec_num].uTreasureType= 21; - else if ( !_strcmpi(item_name, "MISC")) + else if ( !_stricmp(item_name, "MISC")) pInfos[curr_rec_num].uTreasureType= 22; - else if ( !_strcmpi(item_name, "SWORD")) + else if ( !_stricmp(item_name, "SWORD")) pInfos[curr_rec_num].uTreasureType= 23; - else if ( !_strcmpi(item_name, "DAGGER")) + else if ( !_stricmp(item_name, "DAGGER")) pInfos[curr_rec_num].uTreasureType= 24; - else if ( !_strcmpi(item_name, "AXE")) + else if ( !_stricmp(item_name, "AXE")) pInfos[curr_rec_num].uTreasureType= 25; - else if ( !_strcmpi(item_name, "SPEAR")) + else if ( !_stricmp(item_name, "SPEAR")) pInfos[curr_rec_num].uTreasureType= 26; - else if ( !_strcmpi(item_name, "BOW")) + else if ( !_stricmp(item_name, "BOW")) pInfos[curr_rec_num].uTreasureType= 27; - else if ( !_strcmpi(item_name, "MACE")) + else if ( !_stricmp(item_name, "MACE")) pInfos[curr_rec_num].uTreasureType= 28; - else if ( !_strcmpi(item_name, "CLUB")) + else if ( !_stricmp(item_name, "CLUB")) pInfos[curr_rec_num].uTreasureType= 29; - else if ( !_strcmpi(item_name, "STAFF")) + else if ( !_stricmp(item_name, "STAFF")) pInfos[curr_rec_num].uTreasureType= 30; - else if ( !_strcmpi(item_name, "LEATHER")) + else if ( !_stricmp(item_name, "LEATHER")) pInfos[curr_rec_num].uTreasureType= 31; - else if ( !_strcmpi(item_name, "CHAIN")) + else if ( !_stricmp(item_name, "CHAIN")) pInfos[curr_rec_num].uTreasureType= 32; - else if ( !_strcmpi(item_name, "PLATE")) + else if ( !_stricmp(item_name, "PLATE")) pInfos[curr_rec_num].uTreasureType= 33; - else if ( !_strcmpi(item_name, "SHIELD")) + else if ( !_stricmp(item_name, "SHIELD")) pInfos[curr_rec_num].uTreasureType= 34; - else if ( !_strcmpi(item_name, "HELM")) + else if ( !_stricmp(item_name, "HELM")) pInfos[curr_rec_num].uTreasureType= 35; - else if ( !_strcmpi(item_name, "BELT")) + else if ( !_stricmp(item_name, "BELT")) pInfos[curr_rec_num].uTreasureType= 36; - else if ( !_strcmpi(item_name, "CAPE")) + else if ( !_stricmp(item_name, "CAPE")) pInfos[curr_rec_num].uTreasureType= 37; - else if ( !_strcmpi(item_name, "GAUNTLETS")) + else if ( !_stricmp(item_name, "GAUNTLETS")) pInfos[curr_rec_num].uTreasureType= 38; - else if ( !_strcmpi(item_name, "BOOTS")) + else if ( !_stricmp(item_name, "BOOTS")) pInfos[curr_rec_num].uTreasureType= 39; - else if ( !_strcmpi(item_name, "RING")) + else if ( !_stricmp(item_name, "RING")) pInfos[curr_rec_num].uTreasureType= 40; - else if ( !_strcmpi(item_name, "AMULET")) + else if ( !_stricmp(item_name, "AMULET")) pInfos[curr_rec_num].uTreasureType= 41; - else if ( !_strcmpi(item_name, "WAND")) + else if ( !_stricmp(item_name, "WAND")) pInfos[curr_rec_num].uTreasureType= 42; - else if ( !_strcmpi(item_name, "SCROLL")) + else if ( !_stricmp(item_name, "SCROLL")) pInfos[curr_rec_num].uTreasureType= 43; - else if ( !_strcmpi(item_name, "GEM")) + else if ( !_stricmp(item_name, "GEM")) pInfos[curr_rec_num].uTreasureType= 46; } } @@ -1072,12 +1072,12 @@ // v74 = v94.field_0; if ( parsed_field.uPropCount < 10 ) { - if (! _strcmpi(parsed_field.pProperties[0], "shot") ) + if (! _stricmp(parsed_field.pProperties[0], "shot") ) { pInfos[curr_rec_num].uSpecialAbilityType=1; pInfos[curr_rec_num].uSpecialAbilityDamageDiceBonus=atoi((char *)(parsed_field.pProperties[1] + 1)); } - else if (!_strcmpi(parsed_field.pProperties[0], "summon") ) + else if (!_stricmp(parsed_field.pProperties[0], "summon") ) { pInfos[curr_rec_num].uSpecialAbilityType=2; if ( parsed_field.uPropCount > 1 ) @@ -1125,13 +1125,13 @@ } } pInfos[curr_rec_num].uSpecialAbilityDamageDiceSides = 0; - if ( !_strcmpi(parsed_field.pProperties[1], "ground") ) + if ( !_stricmp(parsed_field.pProperties[1], "ground") ) pInfos[curr_rec_num].uSpecialAbilityDamageDiceSides = 1; if ( pInfos[curr_rec_num].field_3C_some_special_attack == -1 ) pInfos[curr_rec_num].uSpecialAbilityType = 0; } } - else if (!_strcmpi(parsed_field.pProperties[0], "explode") ) + else if (!_stricmp(parsed_field.pProperties[0], "explode") ) { pInfos[curr_rec_num].uSpecialAbilityType = 3; ParseDamage((char*)parsed_field.pProperties[1], &pInfos[curr_rec_num].uSpecialAbilityDamageDiceRolls, @@ -1164,7 +1164,7 @@ return -1; for (signed __int16 i=1; i<=uNumMonsters; ++i) { - if( (!_strcmpi(pMonsters[i].pMonsterName, pMonsterName))) + if( (!_stricmp(pMonsters[i].pMonsterName, pMonsterName))) return i; } }
--- a/Mouse.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Mouse.cpp Mon May 27 21:37:14 2013 +0200 @@ -64,11 +64,11 @@ v2 = this; if ( !this->bInitialized || !pName ) return; - if ( _strcmpi("MICON2", pName) ) + if ( _stricmp("MICON2", pName) ) pGame->uFlags2 &= 0xFFFFFFEFu; else pGame->uFlags2 |= 0x10u; - if ( _strcmpi(v2->pCurrentCursorName, pName) ) + if ( _stricmp(v2->pCurrentCursorName, pName) ) strcpy(v2->pCurrentCursorName, pName); ClearCursor(); if ( _strnicmp(pName, "MICON1", 5u) )
--- a/NPC.cpp Mon May 27 21:30:40 2013 +0200 +++ b/NPC.cpp Mon May 27 21:37:14 2013 +0200 @@ -1177,27 +1177,27 @@ break; case 2: { - if ( !_strcmpi(test_string, "potion")) + if ( !_stricmp(test_string, "potion")) { pAutonoteTxt[i].eType = AUTONOTE_POTION_RECEPIE; break; } - if ( !_strcmpi(test_string, "stat") ) + if ( !_stricmp(test_string, "stat") ) { pAutonoteTxt[i].eType = AUTONOTE_STAT_HINT; break; } - if ( !_strcmpi(test_string, "seer") ) + if ( !_stricmp(test_string, "seer") ) { pAutonoteTxt[i].eType = AUTONOTE_SEER; break; } - if ( !_strcmpi(test_string, "obelisk") ) + if ( !_stricmp(test_string, "obelisk") ) { pAutonoteTxt[i].eType = AUTONOTE_OBELISK; break; } - if ( !_strcmpi(test_string, "teacher") ) + if ( !_stricmp(test_string, "teacher") ) { pAutonoteTxt[i].eType = AUTONOTE_TEACHER; break;
--- a/Outdoor.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Outdoor.cpp Mon May 27 21:37:14 2013 +0200 @@ -2701,7 +2701,7 @@ v1 = 0; v8 = 0; - if ( !_strcmpi(pCurrentMapName, "out09.odm") ) + if ( !_stricmp(pCurrentMapName, "out09.odm") ) v8 = 1; for (uint i = 0; i < uNumLevelDecorations; ++i)
--- a/Overlays.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Overlays.cpp Mon May 27 21:37:14 2013 +0200 @@ -252,9 +252,9 @@ v10 = atoi(v19.pProperties[0]); v11 = v19.pProperties[1]; v2->pOverlays[v2->uNumOverlays].uOverlayID = v10; - if ( _strcmpi(v11, "center") ) + if ( _stricmp(v11, "center") ) { - v12 = _strcmpi(v19.pProperties[1], "transparent"); + v12 = _stricmp(v19.pProperties[1], "transparent"); v13 = v2->pOverlays; v14 = v12 == 0; v15 = v2->uNumOverlays;
--- a/SaveLoad.cpp Mon May 27 21:30:40 2013 +0200 +++ b/SaveLoad.cpp Mon May 27 21:37:14 2013 +0200 @@ -256,7 +256,7 @@ //v66 = a2; strcpy(byte_6BE3B0, pCurrentMapName); - if (!_strcmpi(pCurrentMapName, "d05.blv")) // arena + if (!_stricmp(pCurrentMapName, "d05.blv")) // arena return; uncompressed_buff = (char*)malloc(1000000); @@ -535,7 +535,7 @@ //v1 = uSlot; //v6 = uSlot; - bNotArena = _strcmpi(pCurrentMapName, "d05.blv"); + bNotArena = _stricmp(pCurrentMapName, "d05.blv"); if ( bNotArena ) { LOD::Directory pDir; // [sp+Ch] [bp-28h]@2
--- a/Spells.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Spells.cpp Mon May 27 21:37:14 2013 +0200 @@ -323,53 +323,53 @@ break; case 3: pInfos[i].uSchool = SPELL_SCHOOL_NONE; - if (!_strcmpi("fire", test_string) ) + if (!_stricmp("fire", test_string) ) { pInfos[i].uSchool =SPELL_SCHOOL_FIRE; break; } - if ( !_strcmpi("air", test_string) ) + if ( !_stricmp("air", test_string) ) { pInfos[i].uSchool = SPELL_SCHOOL_AIR; break; } - if ( !_strcmpi("water", test_string)) + if ( !_stricmp("water", test_string)) { pInfos[i].uSchool = SPELL_SCHOOL_WATER; break; } - if ( !_strcmpi("earth", test_string)) + if ( !_stricmp("earth", test_string)) { pInfos[i].uSchool = SPELL_SCHOOL_EARTH; break; } - if ( !_strcmpi("spirit", test_string)) + if ( !_stricmp("spirit", test_string)) { pInfos[i].uSchool = SPELL_SCHOOL_SPIRIT; break; } - if ( !_strcmpi("mind", test_string)) + if ( !_stricmp("mind", test_string)) { pInfos[i].uSchool = SPELL_SCHOOL_MIND; break; } - if ( !_strcmpi("body", test_string) ) + if ( !_stricmp("body", test_string) ) { pInfos[i].uSchool = SPELL_SCHOOL_BODY; break; } - if ( !_strcmpi("light", test_string) ) + if ( !_stricmp("light", test_string) ) { pInfos[i].uSchool = SPELL_SCHOOL_LIGHT; break; } - if ( !_strcmpi("dark", test_string)) + if ( !_stricmp("dark", test_string)) { pInfos[i].uSchool = SPELL_SCHOOL_DARK; break; } - if ( !_strcmpi("magic", test_string)) + if ( !_stricmp("magic", test_string)) { pInfos[i].uSchool = SPELL_SCHOOL_MAGIC; break;
--- a/Sprites.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Sprites.cpp Mon May 27 21:37:14 2013 +0200 @@ -475,18 +475,18 @@ v16 = (int)&v2->pSpriteSFrames[v2->uNumSpriteFrames]; if ( *(short *)(v16 + 48) ) *(int *)(v16 + 44) |= 2u; - if ( !_strcmpi(v43.pProperties[2], "new") ) + if ( !_stricmp(v43.pProperties[2], "new") ) { v17 = (int)&v2->pSpriteSFrames[v2->uNumSpriteFrames].uFlags; *(int *)v17 |= 4u; v2->pSpritePFrames[v2->uNumEFrames] = &v2->pSpriteSFrames[v2->uNumSpriteFrames]; v2->pSpriteEFrames[v2->uNumEFrames++] = LOWORD(v2->uNumSpriteFrames); } - if ( !_strcmpi(v43.pProperties[10], "1") ) + if ( !_stricmp(v43.pProperties[10], "1") ) BYTE2(v2->pSpriteSFrames[v2->uNumSpriteFrames].uFlags) |= 4u; - if ( !_strcmpi(v43.pProperties[11], "1") ) + if ( !_stricmp(v43.pProperties[11], "1") ) BYTE2(v2->pSpriteSFrames[v2->uNumSpriteFrames].uFlags) |= 2u; - if ( !_strcmpi(v43.pProperties[12], "1") ) + if ( !_stricmp(v43.pProperties[12], "1") ) { v18 = (int)&v2->pSpriteSFrames[v2->uNumSpriteFrames].uFlags; *(int *)v18 |= 0x20u; @@ -514,23 +514,23 @@ for ( j = 13; j < v43.uPropCount; ++j ) { v24 = v43.pProperties[j]; - if ( _strcmpi(v43.pProperties[j], "Luminous") ) + if ( _stricmp(v43.pProperties[j], "Luminous") ) { - if ( _strcmpi(v24, "Mirror0") ) + if ( _stricmp(v24, "Mirror0") ) { - if ( _strcmpi(v24, "Mirror1") ) + if ( _stricmp(v24, "Mirror1") ) { - if ( _strcmpi(v24, "Mirror2") ) + if ( _stricmp(v24, "Mirror2") ) { - if ( _strcmpi(v24, "Mirror3") ) + if ( _stricmp(v24, "Mirror3") ) { - if ( _strcmpi(v24, "Mirror4") ) + if ( _stricmp(v24, "Mirror4") ) { - if ( _strcmpi(v24, "Mirror5") ) + if ( _stricmp(v24, "Mirror5") ) { - if ( _strcmpi(v24, "Mirror6") ) + if ( _stricmp(v24, "Mirror6") ) { - if ( !_strcmpi(v24, "Mirror7") ) + if ( !_stricmp(v24, "Mirror7") ) BYTE1(v2->pSpriteSFrames[v2->uNumSpriteFrames].uFlags) |= 0x80u; } else @@ -622,7 +622,7 @@ { do { - if ( _strcmpi(v2->pSpritePFrames[(int)Argsc]->pIconName, v2->pSpritePFrames[v35]->pIconName) < 0 ) + if ( _stricmp(v2->pSpritePFrames[(int)Argsc]->pIconName, v2->pSpritePFrames[v35]->pIconName) < 0 ) { v36 = v2->pSpritePFrames; v37 = (int)&v36[(int)Argsc];
--- a/Texture.cpp Mon May 27 21:30:40 2013 +0200 +++ b/Texture.cpp Mon May 27 21:37:14 2013 +0200 @@ -307,7 +307,7 @@ } else { - while ( _strcmpi(v2->pTextures[v3].pTextureName, Str2) ) + while ( _stricmp(v2->pTextures[v3].pTextureName, Str2) ) { ++uID; ++v3;
--- a/TileTable.cpp Mon May 27 21:30:40 2013 +0200 +++ b/TileTable.cpp Mon May 27 21:37:14 2013 +0200 @@ -254,59 +254,59 @@ v9 = v84.pProperties[3]; v2->pTiles[v2->sNumTiles].uBitmapID = v8; v2->pTiles[v2->sNumTiles].tileset = Tileset_Grass; - if ( _strcmpi(v9, "TTtype_NULL") ) + if ( _stricmp(v9, "TTtype_NULL") ) { - if ( _strcmpi(v9, "TTtype_Start") ) + if ( _stricmp(v9, "TTtype_Start") ) { - if ( _strcmpi(v9, "TTtype_Grass") ) + if ( _stricmp(v9, "TTtype_Grass") ) { - if ( _strcmpi(v9, "TTtype_Cracked") ) + if ( _stricmp(v9, "TTtype_Cracked") ) { - if ( _strcmpi(v9, "TTtype_Snow") ) + if ( _stricmp(v9, "TTtype_Snow") ) { - if ( _strcmpi(v9, "TTtype_Sand") ) + if ( _stricmp(v9, "TTtype_Sand") ) { - if ( _strcmpi(v9, "TTtype_Volcano") ) + if ( _stricmp(v9, "TTtype_Volcano") ) { - if ( _strcmpi(v9, "TTtype_Dirt") ) + if ( _stricmp(v9, "TTtype_Dirt") ) { - if ( _strcmpi(v9, "TTtype_Water") ) + if ( _stricmp(v9, "TTtype_Water") ) { - if ( _strcmpi(v9, "TTtype_Tropical") ) + if ( _stricmp(v9, "TTtype_Tropical") ) { - if ( _strcmpi(v9, "TTtype_Swamp") ) + if ( _stricmp(v9, "TTtype_Swamp") ) { - if ( _strcmpi(v9, "TTtype_City") ) + if ( _stricmp(v9, "TTtype_City") ) { - if ( _strcmpi(v9, "TTtype_RoadGrassCobble") ) + if ( _stricmp(v9, "TTtype_RoadGrassCobble") ) { - if ( _strcmpi(v9, "TTtype_RoadGrassDirt") ) + if ( _stricmp(v9, "TTtype_RoadGrassDirt") ) { - if ( _strcmpi(v9, "TTtype_RoadCrackedCobble") ) + if ( _stricmp(v9, "TTtype_RoadCrackedCobble") ) { - if ( _strcmpi(v9, "TTtype_RoadCrackedDirt") ) + if ( _stricmp(v9, "TTtype_RoadCrackedDirt") ) { - if ( _strcmpi(v9, "TTtype_RoadSandCobble") ) + if ( _stricmp(v9, "TTtype_RoadSandCobble") ) { - if ( _strcmpi(v9, "TTtype_RoadSandDirt") ) + if ( _stricmp(v9, "TTtype_RoadSandDirt") ) { - if ( _strcmpi(v9, "TTtype_RoadVolcanoCobble") ) + if ( _stricmp(v9, "TTtype_RoadVolcanoCobble") ) { - if ( _strcmpi(v9, "TTtype_RoadVolcanoDirt") ) + if ( _stricmp(v9, "TTtype_RoadVolcanoDirt") ) { - if ( _strcmpi(v9, "TTtype_RoadSwampCobble") ) + if ( _stricmp(v9, "TTtype_RoadSwampCobble") ) { - if ( _strcmpi(v9, "TTtype_RoadSwampDirt") ) + if ( _stricmp(v9, "TTtype_RoadSwampDirt") ) { - if ( _strcmpi(v9, "TTtype_RoadTropicalCobble") ) + if ( _stricmp(v9, "TTtype_RoadTropicalCobble") ) { - if ( _strcmpi(v9, "TTtype_RoadTropicalDirt") ) + if ( _stricmp(v9, "TTtype_RoadTropicalDirt") ) { - if ( _strcmpi(v9, "TTtype_RoadSnowCobble") ) + if ( _stricmp(v9, "TTtype_RoadSnowCobble") ) { - if ( _strcmpi(v9, "TTtype_RoadSnowDirt") ) + if ( _stricmp(v9, "TTtype_RoadSnowDirt") ) { - if ( !_strcmpi(v9, "TTtype_RoadCityStone") ) + if ( !_stricmp(v9, "TTtype_RoadCityStone") ) { v34 = (int)&v2->pTiles[v2->sNumTiles].tileset; *(char *)v34 |= 0x1Cu; @@ -464,30 +464,30 @@ v35 = v84.pProperties[4]; v2->pTiles[v2->sNumTiles].uSection = 0; v2->pTiles[v2->sNumTiles].uAttributes = 0; - if ( !_strcmpi(v35, "TTsect_NULL") ) + if ( !_stricmp(v35, "TTsect_NULL") ) { LOBYTE(v2->pTiles[v2->sNumTiles].uSection) = -1; LABEL_152: for ( j = 5; j < v84.uPropCount; ++j ) { v72 = v84.pProperties[j]; - if ( _strcmpi(v84.pProperties[j], "TTattr_Burn") ) + if ( _stricmp(v84.pProperties[j], "TTattr_Burn") ) { - if ( _strcmpi(v72, "TTattr_Water") ) + if ( _stricmp(v72, "TTattr_Water") ) { - if ( _strcmpi(v72, "TTattr_Water2") ) + if ( _stricmp(v72, "TTattr_Water2") ) { - if ( _strcmpi(v72, "TTattr_Block") ) + if ( _stricmp(v72, "TTattr_Block") ) { - if ( _strcmpi(v72, "TTattr_Repulse") ) + if ( _stricmp(v72, "TTattr_Repulse") ) { - if ( _strcmpi(v72, "TTattr_Flat") ) + if ( _stricmp(v72, "TTattr_Flat") ) { - if ( _strcmpi(v72, "TTattr_Wave") ) + if ( _stricmp(v72, "TTattr_Wave") ) { - if ( _strcmpi(v72, "TTattr_NoDraw") ) + if ( _stricmp(v72, "TTattr_NoDraw") ) { - if ( !_strcmpi(v72, "TTattr_Transition") ) + if ( !_stricmp(v72, "TTattr_Transition") ) { v80 = (int)&v2->pTiles[v2->sNumTiles].uAttributes; *(short *)v80 |= 0x200u; @@ -543,245 +543,245 @@ ++v2->sNumTiles; goto LABEL_173; } - if ( !_strcmpi(v35, "TTsect_Start") ) + if ( !_stricmp(v35, "TTsect_Start") ) { v36 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v36 |= 0xFEu; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Base1") ) + if ( !_stricmp(v35, "TTsect_Base1") ) goto LABEL_152; - if ( !_strcmpi(v35, "TTsect_Base2") ) + if ( !_stricmp(v35, "TTsect_Base2") ) { v37 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v37 |= 1u; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Base3") ) + if ( !_stricmp(v35, "TTsect_Base3") ) { v38 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v38 |= 2u; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Base4") ) + if ( !_stricmp(v35, "TTsect_Base4") ) { v39 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v39 |= 3u; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Special1") ) + if ( !_stricmp(v35, "TTsect_Special1") ) { v40 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v40 |= 4u; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Special2") ) + if ( !_stricmp(v35, "TTsect_Special2") ) { v41 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v41 |= 5u; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Special3") ) + if ( !_stricmp(v35, "TTsect_Special3") ) { v42 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v42 |= 6u; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Special4") ) + if ( !_stricmp(v35, "TTsect_Special4") ) { v43 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v43 |= 7u; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Special5") ) + if ( !_stricmp(v35, "TTsect_Special5") ) { v44 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v44 |= 8u; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Special6") ) + if ( !_stricmp(v35, "TTsect_Special6") ) { v45 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v45 |= 9u; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Special7") ) + if ( !_stricmp(v35, "TTsect_Special7") ) { v46 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v46 |= 0xAu; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_Special8") ) + if ( !_stricmp(v35, "TTsect_Special8") ) { v47 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v47 |= 0xBu; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_NE1") ) + if ( !_stricmp(v35, "TTsect_NE1") ) goto LABEL_130; - if ( !_strcmpi(v35, "TTsect_NW1") ) + if ( !_stricmp(v35, "TTsect_NW1") ) goto LABEL_134; - if ( !_strcmpi(v35, "TTsect_SE1") ) + if ( !_stricmp(v35, "TTsect_SE1") ) goto LABEL_130; - if ( !_strcmpi(v35, "TTsect_SW1") ) + if ( !_stricmp(v35, "TTsect_SW1") ) goto LABEL_134; - if ( !_strcmpi(v35, "TTsect_E1") ) + if ( !_stricmp(v35, "TTsect_E1") ) goto LABEL_138; - if ( !_strcmpi(v35, "TTsect_W1") ) + if ( !_stricmp(v35, "TTsect_W1") ) goto LABEL_140; - if ( !_strcmpi(v35, "TTsect_N1") ) + if ( !_stricmp(v35, "TTsect_N1") ) goto LABEL_142; - if ( !_strcmpi(v35, "TTsect_S1") ) + if ( !_stricmp(v35, "TTsect_S1") ) goto LABEL_144; - if ( !_strcmpi(v35, "TTsect_XNE1") ) + if ( !_stricmp(v35, "TTsect_XNE1") ) goto LABEL_146; - if ( _strcmpi(v35, "TTsect_XNW1") ) + if ( _stricmp(v35, "TTsect_XNW1") ) { - if ( !_strcmpi(v35, "TTsect_XSE1") ) + if ( !_stricmp(v35, "TTsect_XSE1") ) goto LABEL_146; - if ( _strcmpi(v35, "TTsect_XSW1") ) + if ( _stricmp(v35, "TTsect_XSW1") ) { - if ( !_strcmpi(v35, "TTsect_CROS") ) + if ( !_stricmp(v35, "TTsect_CROS") ) { LABEL_151: v70 = (int)&v2->pTiles[v2->sNumTiles].uAttributes; *(short *)v70 |= 0x200u; goto LABEL_152; } - if ( !_strcmpi(v35, "TTsect_NS") ) + if ( !_stricmp(v35, "TTsect_NS") ) { v48 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v48 |= 1u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_EW") ) + if ( !_stricmp(v35, "TTsect_EW") ) { v49 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v49 |= 2u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_N_E") ) + if ( !_stricmp(v35, "TTsect_N_E") ) { v50 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v50 |= 3u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_N_W") ) + if ( !_stricmp(v35, "TTsect_N_W") ) { v51 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v51 |= 4u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_S_E") ) + if ( !_stricmp(v35, "TTsect_S_E") ) { v52 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v52 |= 5u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_S_W") ) + if ( !_stricmp(v35, "TTsect_S_W") ) { v53 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v53 |= 6u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_NS_E") ) + if ( !_stricmp(v35, "TTsect_NS_E") ) { v54 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v54 |= 7u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_NS_W") ) + if ( !_stricmp(v35, "TTsect_NS_W") ) { v55 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v55 |= 8u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_EW_N") ) + if ( !_stricmp(v35, "TTsect_EW_N") ) { v56 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v56 |= 9u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_EW_S") ) + if ( !_stricmp(v35, "TTsect_EW_S") ) { v57 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v57 |= 0xAu; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_NCAP") ) + if ( !_stricmp(v35, "TTsect_NCAP") ) { v58 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v58 |= 0xBu; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_ECAP") ) + if ( !_stricmp(v35, "TTsect_ECAP") ) { LABEL_130: v59 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v59 |= 0xCu; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_SCAP") ) + if ( !_stricmp(v35, "TTsect_SCAP") ) { v60 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v60 |= 0xDu; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_WCAP") ) + if ( !_stricmp(v35, "TTsect_WCAP") ) { LABEL_134: v61 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v61 |= 0xEu; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_DN") ) + if ( !_stricmp(v35, "TTsect_DN") ) { v62 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v62 |= 0xFu; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_DS") ) + if ( !_stricmp(v35, "TTsect_DS") ) { LABEL_138: v63 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v63 |= 0x10u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_DW") ) + if ( !_stricmp(v35, "TTsect_DW") ) { LABEL_140: v64 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v64 |= 0x11u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_DE") ) + if ( !_stricmp(v35, "TTsect_DE") ) { LABEL_142: v65 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v65 |= 0x12u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_DSW") ) + if ( !_stricmp(v35, "TTsect_DSW") ) { LABEL_144: v66 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v66 |= 0x13u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_DNE") ) + if ( !_stricmp(v35, "TTsect_DNE") ) { LABEL_146: v67 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v67 |= 0x14u; goto LABEL_151; } - if ( !_strcmpi(v35, "TTsect_DSE") ) + if ( !_stricmp(v35, "TTsect_DSE") ) { v68 = (int)&v2->pTiles[v2->sNumTiles].uSection; *(char *)v68 |= 0x15u; goto LABEL_151; } - if ( _strcmpi(v35, "TTsect_DNW") ) + if ( _stricmp(v35, "TTsect_DNW") ) goto LABEL_152; } }
--- a/UIHouses.cpp Mon May 27 21:30:40 2013 +0200 +++ b/UIHouses.cpp Mon May 27 21:37:14 2013 +0200 @@ -1893,7 +1893,7 @@ v5 = &transport_schedule[transport_routes[(unsigned int)window_SpeakInHouse->ptr_1C - HOUSE_STABLES_HARMONDALE][dialog_menu_id - HOUSE_DIALOGUE_TRANSPORT_SCHEDULE_1]]; if ( v5->pSchedule[pParty->uDaysPlayed % 7] ) { - if ( _strcmpi(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename) ) + if ( _stricmp(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename) ) { SaveGame(1, 0); strcpy(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename);
--- a/UIRest.cpp Mon May 27 21:30:40 2013 +0200 +++ b/UIRest.cpp Mon May 27 21:37:14 2013 +0200 @@ -87,7 +87,7 @@ --uRestUI_FoodRequiredToRest; if ( uRestUI_FoodRequiredToRest < 1 ) uRestUI_FoodRequiredToRest = 1; - if ( !_strcmpi(pCurrentMapName, "d29.blv") && _449B57_test_bit(pParty->_quest_bits, 98) ) + if ( !_stricmp(pCurrentMapName, "d29.blv") && _449B57_test_bit(pParty->_quest_bits, 98) ) uRestUI_FoodRequiredToRest = 0; ++pIcons_LOD->uTexturePacksCount;
--- a/UISaveLoad.cpp Mon May 27 21:30:40 2013 +0200 +++ b/UISaveLoad.cpp Mon May 27 21:37:14 2013 +0200 @@ -330,7 +330,7 @@ v4 = pLODFile.FindContainer("header.bin", true); if ( v4 ) fread(&pSavegameHeader[i], 0x64, 1, v4); - if ( !_strcmpi(pSavegameList->pFileList[i].pSaveFileName, pGlobalTXT_LocalizationStrings[613]) )// "AutoSave.MM7" + if ( !_stricmp(pSavegameList->pFileList[i].pSaveFileName, pGlobalTXT_LocalizationStrings[613]) )// "AutoSave.MM7" strcpy(pSavegameHeader[i].pName, pGlobalTXT_LocalizationStrings[16]);// "Autosave" v5 = pLODFile.FindContainer("image.pcx", true); if ( !v5 )
--- a/UiGame.cpp Mon May 27 21:30:40 2013 +0200 +++ b/UiGame.cpp Mon May 27 21:37:14 2013 +0200 @@ -925,7 +925,7 @@ v15 = v14; if ( v14 ) { - if ( _strcmpi(v14, "") ) + if ( _stricmp(v14, "") ) v21 = (char *)v15; } } @@ -2904,7 +2904,7 @@ else { v20 = 0; - while ( _strcmpi("spell96", pIconsFrameTable->pIcons[v20 / 0x20].pAnimationName) ) + while ( _stricmp("spell96", pIconsFrameTable->pIcons[v20 / 0x20].pAnimationName) ) { ++v21; v20 += 32;
--- a/VideoPlayer.cpp Mon May 27 21:30:40 2013 +0200 +++ b/VideoPlayer.cpp Mon May 27 21:37:14 2013 +0200 @@ -908,7 +908,7 @@ { for ( v3 = 0; v3 < (signed int)pVideoPlayer->uNumMightVideoHeaders; ++v3) { - v4 = _strcmpi(pVideoPlayer->pMightVideoHeaders[v3].pVideoName, pFilename); + v4 = _stricmp(pVideoPlayer->pMightVideoHeaders[v3].pVideoName, pFilename); if ( !v4 ) { SetFilePointer(pVideoPlayer->hMightVid, pVideoPlayer->pMightVideoHeaders[v3].uFileOffset, 0, 0); @@ -919,7 +919,7 @@ v5 = 0; if ( (signed int)pVideoPlayer->uNumMagicVideoHeaders > 0 ) { - while ( _strcmpi(pVideoPlayer->pMagicVideoHeaders[v5].pVideoName, pFilename) ) + while ( _stricmp(pVideoPlayer->pMagicVideoHeaders[v5].pVideoName, pFilename) ) { ++v5; if ( v5 >= (signed int)pVideoPlayer->uNumMagicVideoHeaders )
--- 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
--- a/mm7_3.cpp Mon May 27 21:30:40 2013 +0200 +++ b/mm7_3.cpp Mon May 27 21:37:14 2013 +0200 @@ -12176,7 +12176,7 @@ v14 = v13; if ( v13 ) { - if ( _strcmpi(v13, "") ) + if ( _stricmp(v13, "") ) v17 = v14; } } @@ -12670,7 +12670,7 @@ { if ( *((_WORD *)v4 + 9) == v6 ) { - if ( pFileName && _strcmpi(pFileName, "0") ) + if ( pFileName && _stricmp(pFileName, "0") ) { v5 = pDecorationList->GetDecorIdByName(pFileName); *((_WORD *)v4 - 1) = v5; @@ -12701,7 +12701,7 @@ if ( pName && (uID = 1, (signed int)this->uNumDecorations > 1) ) { v4 = 1; - while ( _strcmpi(pName, v2->pDecorations[v4].pName) ) + while ( _stricmp(pName, v2->pDecorations[v4].pName) ) { ++uID; ++v4; @@ -13722,7 +13722,7 @@ v2 = pMapName; pAudioPlayer->StopChannels(-1, -1); pGameLoadingUI_ProgressBar->Initialize(GUIProgressBar::TYPE_None); - if ( _strcmpi(pCurrentMapName, v2) ) + if ( _stricmp(pCurrentMapName, v2) ) SaveGame(1, 0); uGameState = GAME_STATE_2; @@ -13960,7 +13960,7 @@ { bool result; // eax@1 - result = _strcmpi("nwc.blv", pCurrentMapName); + result = _stricmp("nwc.blv", pCurrentMapName); if ( result ) { _5B65A8_npcdata_uflags_or_other = 0;
--- a/mm7_4.cpp Mon May 27 21:30:40 2013 +0200 +++ b/mm7_4.cpp Mon May 27 21:37:14 2013 +0200 @@ -2936,7 +2936,7 @@ v2->pFrames[v2->uNumFrames].uFlags = 0; for ( j = 3; j < v24.uPropCount; ++j ) { - if ( !_strcmpi(v24.pProperties[j], "New") ) + if ( !_stricmp(v24.pProperties[j], "New") ) { v13 = (int)&v2->pFrames[v2->uNumFrames].uFlags; *(char *)v13 |= 4u; @@ -2998,7 +2998,7 @@ } else { - while ( _strcmpi(pIconName, v2->pIcons[v3].pAnimationName) ) + while ( _stricmp(pIconName, v2->pIcons[v3].pAnimationName) ) { ++uID; ++v3; @@ -3166,7 +3166,7 @@ strcpy(v2->pIcons[v2->uNumIcons].pTextureName, v20.pProperties[1]); v8 = v20.pProperties[2]; v2->pIcons[v2->uNumIcons].uFlags = 0; - if ( !_strcmpi(v8, "new") ) + if ( !_stricmp(v8, "new") ) { v9 = (int)&v2->pIcons[v2->uNumIcons].uFlags; *(char *)v9 |= 4u; @@ -7968,12 +7968,12 @@ if( v8 < (signed int)pNPCStats->uNumNewNPCs ) v6[8] &= 0x7Fu; } - if ( pParty->pHirelings[0].pName && !_strcmpi(pParty->pHirelings[0].pName, speakingNPC->pName) ) + if ( pParty->pHirelings[0].pName && !_stricmp(pParty->pHirelings[0].pName, speakingNPC->pName) ) { v11 = pParty->pHirelings; memset(v11, 0, sizeof(NPCData)); } - else if ( pParty->pHirelings[1].pName && !_strcmpi(pParty->pHirelings[1].pName, speakingNPC->pName) ) + else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) ) { v11 = &pParty->pHirelings[1]; memset(v11, 0, sizeof(NPCData)); @@ -8079,12 +8079,12 @@ if ( v5 < (signed int)pNPCStats->uNumNewNPCs ) v6[8] &= 0x7Fu; } - if ( pParty->pHirelings[0].pName && !_strcmpi(pParty->pHirelings[0].pName, speakingNPC->pName) ) + if ( pParty->pHirelings[0].pName && !_stricmp(pParty->pHirelings[0].pName, speakingNPC->pName) ) { v11 = pParty->pHirelings; memset(v11, 0, sizeof(NPCData)); } - else if ( pParty->pHirelings[1].pName && !_strcmpi(pParty->pHirelings[1].pName, speakingNPC->pName) ) + else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) ) { v11 = &pParty->pHirelings[1]; memset(v11, 0, sizeof(NPCData));
--- 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; }
--- a/mm7_6.cpp Mon May 27 21:30:40 2013 +0200 +++ b/mm7_6.cpp Mon May 27 21:37:14 2013 +0200 @@ -4494,7 +4494,7 @@ case SPELL_WATER_LLOYDS_BEACON: { LODWORD(v733) = 604800 * v2; - if ( !_strcmpi(pCurrentMapName, "d05.blv") ) + if ( !_stricmp(pCurrentMapName, "d05.blv") ) { ShowStatusBarString(pGlobalTXT_LocalizationStrings[428], 2); // Spell failed pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0);