Mercurial > mm7
diff mm7_6.cpp @ 609:42d5777c2f47
Слияние
author | Ritor1 |
---|---|
date | Wed, 06 Mar 2013 18:22:25 +0600 |
parents | f90753ebabe3 |
children | c03428cb4119 |
line wrap: on
line diff
--- a/mm7_6.cpp Wed Mar 06 18:22:07 2013 +0600 +++ b/mm7_6.cpp Wed Mar 06 18:22:25 2013 +0600 @@ -1431,7 +1431,7 @@ v4 = Dst.uItemID; } if ( pItemsTable->pItems[v5].uEquipType == 14 && v4 != 220 ) - Dst.uEncantmentType = 2 * rand() % 4 + 2; + Dst.uEnchantmentType = 2 * rand() % 4 + 2; pItemsTable->SetSpecialBonus(&Dst); if ( !pParty->AddItem(&Dst) ) pParty->SetHoldingItem(&Dst); @@ -3756,7 +3756,7 @@ LABEL_139: DamageMonsterFromParty(8 * v42 | 2, v47, v670); goto LABEL_1056; - case 2: + case SPELL_FIRE_FIRE_BOLT: case 6: case 11: case 18: @@ -3980,7 +3980,7 @@ { if (!v730c->uSpecEnchantmentType) { - if (!v730c->uEncantmentType) + if (!v730c->uEnchantmentType) { v68 = BYTE4(v726->pConditions[3]); if ( !v68 || v68 == 1 || v68 == 2 ) @@ -4702,9 +4702,9 @@ } goto LABEL_1056; case 16: - if ( pParty->uFlags & 8 ) - { - v190 = pGlobalTXT_LocalizationStrings[493]; + if ( pParty->uFlags & PARTY_FLAGS_1_FALLING) + { + v190 = pGlobalTXT_LocalizationStrings[493]; // Can't cast Jump while airborne! goto LABEL_462; } if ( !pPlayer->CanCastSpell(uRequiredMana) ) @@ -4768,7 +4768,7 @@ case 21: if ( uCurrentlyLoadedLevelType == LEVEL_Indoor) { - v190 = pGlobalTXT_LocalizationStrings[494]; + v190 = pGlobalTXT_LocalizationStrings[494]; // Can not cast Fly indoors! LABEL_462: ShowStatusBarString(v190, 2u); pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0); @@ -5307,7 +5307,7 @@ if ( v731 != 4 || (v245 = (int)&v726->pInventoryItems[a2], v246 = *(int *)v245, *(int *)v245 > 134) || v726->pInventoryItems[a2].uSpecEnchantmentType != 0 - || v726->pInventoryItems[a2].uEncantmentType != 0 + || v726->pInventoryItems[a2].uEnchantmentType != 0 || v726->pInventoryItems[a2]._bonus_strength != 0 || (_this = (ItemGen *)((char *)&v726->pInventoryItems[a2] + 20), v726->pInventoryItems[a2].Broken()) ) goto LABEL_616; @@ -5412,7 +5412,7 @@ LODWORD(v725) = (int)(char *)&pItemsTable + 48 * v290 + 4; if ( v290 > 134 || _this->uSpecEnchantmentType != 0 - || _this->uEncantmentType != 0 + || _this->uEnchantmentType != 0 || _this->_bonus_strength != 0 || (v291 = pItemsTable->pItems[v290].uEquipType) == 0 || v291 == 1 @@ -5487,13 +5487,13 @@ v293 = rand(); v294 = _this; v295 = v293 % 10;// pItemsTable->field_116D8[pItemsTable->pItems[_this->uItemID].uEquipType]; - _this->uEncantmentType = 0; + _this->uEnchantmentType = 0; for ( kk = pItemsTable->pEnchantments[0].to_item[pItemsTable->pItems[v294->uItemID].uEquipType + 1]; ; - kk += pItemsTable->pEnchantments[v294->uEncantmentType].to_item[pItemsTable->pItems[v294->uItemID].uEquipType + kk += pItemsTable->pEnchantments[v294->uEnchantmentType].to_item[pItemsTable->pItems[v294->uItemID].uEquipType + 1] ) { - ++v294->uEncantmentType; + ++v294->uEnchantmentType; if ( kk >= v295 ) break; }