Mercurial > mm7

comparison mm7_3.cpp @ 1080:9456f2ed5ff9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
getskillbonus continue cleaning
author Gloval
date Sat, 25 May 2013 23:50:56 +0400
parents 48168499f52e
children ddf53a2d0bf5
comparison
equal deleted inserted replaced
1077:2210109f280d 1080:9456f2ed5ff9
1630 1630
1631 uint fall_start; 1631 uint fall_start;
1632 if (!pParty->FeatherFallActive()) 1632 if (!pParty->FeatherFallActive())
1633 { 1633 {
1634 bFeatherFall = false; 1634 bFeatherFall = false;
1635 if (!pParty->pPlayers[0].WearsItem(ITEM_ARTIFACT_LADYS_ESCORT, 16) && // grants feather fall 1635 if (!pParty->pPlayers[0].WearsItem(ITEM_ARTIFACT_LADYS_ESCORT, EQIUP_ANY) && // grants feather fall
1636 !pParty->pPlayers[1].WearsItem(ITEM_ARTIFACT_LADYS_ESCORT, 16) && 1636 !pParty->pPlayers[1].WearsItem(ITEM_ARTIFACT_LADYS_ESCORT, EQIUP_ANY) &&
1637 !pParty->pPlayers[2].WearsItem(ITEM_ARTIFACT_LADYS_ESCORT, 16) && 1637 !pParty->pPlayers[2].WearsItem(ITEM_ARTIFACT_LADYS_ESCORT, EQIUP_ANY) &&
1638 !pParty->pPlayers[3].WearsItem(ITEM_ARTIFACT_LADYS_ESCORT, 16)) 1638 !pParty->pPlayers[3].WearsItem(ITEM_ARTIFACT_LADYS_ESCORT, EQIUP_ANY))
1639 { 1639 {
1640 fall_start = pParty->uFallStartY; 1640 fall_start = pParty->uFallStartY;
1641 } 1641 }
1642 } 1642 }
1643 else 1643 else
1654 if (pParty->uFlags & PARTY_FLAGS_1_LANDING) 1654 if (pParty->uFlags & PARTY_FLAGS_1_LANDING)
1655 pParty->uFlags &= ~PARTY_FLAGS_1_LANDING; 1655 pParty->uFlags &= ~PARTY_FLAGS_1_LANDING;
1656 else for (uint i = 0; i < 4; ++i) 1656 else for (uint i = 0; i < 4; ++i)
1657 { // receive falling damage 1657 { // receive falling damage
1658 auto player = pParty->pPlayers + i; 1658 auto player = pParty->pPlayers + i;
1659 if (!player->HasEnchantedItemEquipped(72) && !player->WearsItem(ITEM_ARTIFACT_HERMES_SANDALS, 8)) 1659 if (!player->HasEnchantedItemEquipped(72) && !player->WearsItem(ITEM_ARTIFACT_HERMES_SANDALS, EQUIP_BOOTS))
1660 { 1660 {
1661 player->ReceiveDamage((pParty->uFallStartY - party_z) * (0.1f * player->GetMaxHealth()) / 256, DMGT_PHISYCAL); 1661 player->ReceiveDamage((pParty->uFallStartY - party_z) * (0.1f * player->GetMaxHealth()) / 256, DMGT_PHISYCAL);
1662 v10 = (double)(20 - player->GetParameterBonus(player->GetActualEndurance())) * flt_6BE3A4_debug_recmod1 * 2.133333333333333; 1662 v10 = (double)(20 - player->GetParameterBonus(player->GetActualEndurance())) * flt_6BE3A4_debug_recmod1 * 2.133333333333333;
1663 player->SetRecoveryTime((signed __int64)v10); 1663 player->SetRecoveryTime((signed __int64)v10);
1664 } 1664 }
1827 if ( pParty->uFallSpeed < -500 && !pParty->bFlying ) 1827 if ( pParty->uFallSpeed < -500 && !pParty->bFlying )
1828 { 1828 {
1829 v41 = &pPlayers[1]; 1829 v41 = &pPlayers[1];
1830 do 1830 do
1831 { 1831 {
1832 if ( !(*v41)->HasEnchantedItemEquipped(72) && !(*v41)->WearsItem(ITEM_ARTIFACT_HERMES_SANDALS, 8) ) 1832 if ( !(*v41)->HasEnchantedItemEquipped(72) && !(*v41)->WearsItem(ITEM_ARTIFACT_HERMES_SANDALS, EQUIP_BOOTS) ) //was 8
1833 (*v41)->PlayEmotion(CHARACTER_EXPRESSION_SCARED, 0); 1833 (*v41)->PlayEmotion(CHARACTER_EXPRESSION_SCARED, 0);
1834 ++v41; 1834 ++v41;
1835 } 1835 }
1836 while ( (signed int)v41 <= (signed int)&pPlayers[4] ); 1836 while ( (signed int)v41 <= (signed int)&pPlayers[4] );
1837 } 1837 }
2255 ++v119; 2255 ++v119;
2256 if ( (signed int)v119 > (signed int)&pPlayers[4] ) 2256 if ( (signed int)v119 > (signed int)&pPlayers[4] )
2257 goto LABEL_9; 2257 goto LABEL_9;
2258 }*/ 2258 }*/
2259 for (int i = 0; i < 4; ++i) 2259 for (int i = 0; i < 4; ++i)
2260 if (pParty->pPlayers[i].WearsItem(536, 16)) // seems like flying boots 2260 if (pParty->pPlayers[i].WearsItem(ITEM_ARTIFACT_LADYS_ESCORT, EQIUP_ANY)) // seems like flying boots
2261 { 2261 {
2262 bFeatherFall = 1; 2262 bFeatherFall = 1;
2263 break; 2263 break;
2264 } 2264 }
2265 } 2265 }
2293 } 2293 }
2294 else for (int _i = 0; _i < 4; ++_i) // receive falling damage 2294 else for (int _i = 0; _i < 4; ++_i) // receive falling damage
2295 { 2295 {
2296 auto player = pParty->pPlayers + _i; 2296 auto player = pParty->pPlayers + _i;
2297 2297
2298 if ( !player->HasEnchantedItemEquipped(72) && !player->WearsItem(529, 8) ) 2298 if ( !player->HasEnchantedItemEquipped(72) && !player->WearsItem(ITEM_ARTIFACT_HERMES_SANDALS, EQUIP_BOOTS) )
2299 { 2299 {
2300 player->ReceiveDamage( 2300 player->ReceiveDamage(
2301 (signed int)((pParty->uFallStartY - pZ) * (unsigned __int64)(player->GetMaxHealth() / 10)) / 256, 2301 (signed int)((pParty->uFallStartY - pZ) * (unsigned __int64)(player->GetMaxHealth() / 10)) / 256,
2302 DMGT_PHISYCAL); 2302 DMGT_PHISYCAL);
2303 v105 = 20 - player->GetParameterBonus(player->GetActualEndurance()); 2303 v105 = 20 - player->GetParameterBonus(player->GetActualEndurance());
2731 && !pParty->FeatherFallActive()) 2731 && !pParty->FeatherFallActive())
2732 { // falling scream 2732 { // falling scream
2733 for (int i = 0; i < 4; ++i) 2733 for (int i = 0; i < 4; ++i)
2734 { 2734 {
2735 auto player = pParty->pPlayers + i; 2735 auto player = pParty->pPlayers + i;
2736 if (!player->HasEnchantedItemEquipped(72) && !player->WearsItem(529, 8) && player->CanAct()) 2736 if (!player->HasEnchantedItemEquipped(72) && !player->WearsItem(ITEM_ARTIFACT_HERMES_SANDALS, EQUIP_BOOTS) && player->CanAct())
2737 player->PlaySound(SPEECH_66, 0); 2737 player->PlaySound(SPEECH_66, 0);
2738 } 2738 }
2739 } 2739 }
2740 } 2740 }
2741 } 2741 }