Mercurial > mm7

comparison mm7_3.cpp @ 1039:682ba1c83fd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Thu, 23 May 2013 03:32:36 +0200
parents ff2d888f8033
children d48c762de563
comparison
equal deleted inserted replaced
1038:39f42990698f 1039:682ba1c83fd3
1660 else for (uint i = 0; i < 4; ++i) 1660 else for (uint i = 0; i < 4; ++i)
1661 { // receive falling damage 1661 { // receive falling damage
1662 auto player = pParty->pPlayers + i; 1662 auto player = pParty->pPlayers + i;
1663 if (!player->HasEnchantedItemEquipped(72) && !player->WearsItem(ITEM_ARTIFACT_HERMES_SANDALS, 8)) 1663 if (!player->HasEnchantedItemEquipped(72) && !player->WearsItem(ITEM_ARTIFACT_HERMES_SANDALS, 8))
1664 { 1664 {
1665 player->ReceiveDamage((pParty->uFallStartY - party_z) * (0.1f * player->GetMaxHealth()) / 256, 4); 1665 player->ReceiveDamage((pParty->uFallStartY - party_z) * (0.1f * player->GetMaxHealth()) / 256, DMGT_PHISYCAL);
1666 v10 = (double)(20 - player->_48EA1B_get_static_effect(player->GetActualEndurance())) * flt_6BE3A4_debug_recmod1 * 2.133333333333333; 1666 v10 = (double)(20 - player->GetParameterBonus(player->GetActualEndurance())) * flt_6BE3A4_debug_recmod1 * 2.133333333333333;
1667 player->SetRecoveryTime((signed __int64)v10); 1667 player->SetRecoveryTime((signed __int64)v10);
1668 } 1668 }
1669 } 1669 }
1670 } 1670 }
1671 1671
2299 2299
2300 if ( !player->HasEnchantedItemEquipped(72) && !player->WearsItem(529, 8) ) 2300 if ( !player->HasEnchantedItemEquipped(72) && !player->WearsItem(529, 8) )
2301 { 2301 {
2302 player->ReceiveDamage( 2302 player->ReceiveDamage(
2303 (signed int)((pParty->uFallStartY - pZ) * (unsigned __int64)(player->GetMaxHealth() / 10)) / 256, 2303 (signed int)((pParty->uFallStartY - pZ) * (unsigned __int64)(player->GetMaxHealth() / 10)) / 256,
2304 4); 2304 DMGT_PHISYCAL);
2305 v105 = 20 - player->_48EA1B_get_static_effect(player->GetActualEndurance()); 2305 v105 = 20 - player->GetParameterBonus(player->GetActualEndurance());
2306 player->SetRecoveryTime((signed __int64)((double)v105 * flt_6BE3A4_debug_recmod1 * 2.133333333333333)); 2306 player->SetRecoveryTime((signed __int64)((double)v105 * flt_6BE3A4_debug_recmod1 * 2.133333333333333));
2307 } 2307 }
2308 //} 2308 //}
2309 //while ( (signed int)v4 <= (signed int)&pPlayers[4] ); 2309 //while ( (signed int)v4 <= (signed int)&pPlayers[4] );
2310 } 2310 }
3079 do 3079 do
3080 { 3080 {
3081 v110 = (*v74)->GetMaxHealth(); 3081 v110 = (*v74)->GetMaxHealth();
3082 (*v74)->ReceiveDamage( 3082 (*v74)->ReceiveDamage(
3083 (signed int)((pParty->uFallStartY - v70) * (unsigned __int64)(signed __int64)((double)v110 * 0.1)) / 256, 3083 (signed int)((pParty->uFallStartY - v70) * (unsigned __int64)(signed __int64)((double)v110 * 0.1)) / 256,
3084 4); 3084 DMGT_PHISYCAL);
3085 v75 = (*v74)->GetActualEndurance(); 3085 v75 = (*v74)->GetActualEndurance();
3086 v110 = 20 - (*v74)->_48EA1B_get_static_effect(v75); 3086 v110 = 20 - (*v74)->GetParameterBonus(v75);
3087 (*v74)->SetRecoveryTime( 3087 (*v74)->SetRecoveryTime(
3088 (signed __int64)((double)v110 * flt_6BE3A4_debug_recmod1 * 2.133333333333333)); 3088 (signed __int64)((double)v110 * flt_6BE3A4_debug_recmod1 * 2.133333333333333));
3089 ++v74; 3089 ++v74;
3090 } 3090 }
3091 while ( (signed int)v74 <= (signed int)&pPlayers[4] ); 3091 while ( (signed int)v74 <= (signed int)&pPlayers[4] );
3201 do 3201 do
3202 { 3202 {
3203 v110 = (*v84)->GetMaxHealth(); 3203 v110 = (*v84)->GetMaxHealth();
3204 (*v84)->ReceiveDamage( 3204 (*v84)->ReceiveDamage(
3205 (signed int)((pParty->uFallStartY - v81) * (unsigned __int64)(signed __int64)((double)v110 * 0.1)) / 256, 3205 (signed int)((pParty->uFallStartY - v81) * (unsigned __int64)(signed __int64)((double)v110 * 0.1)) / 256,
3206 4); 3206 DMGT_PHISYCAL);
3207 v85 = (*v84)->GetActualEndurance(); 3207 v85 = (*v84)->GetActualEndurance();
3208 v110 = 20 - (*v84)->_48EA1B_get_static_effect(v85); 3208 v110 = 20 - (*v84)->GetParameterBonus(v85);
3209 (*v84)->SetRecoveryTime((signed __int64)((double)v110 * flt_6BE3A4_debug_recmod1 * 2.133333333333333)); 3209 (*v84)->SetRecoveryTime((signed __int64)((double)v110 * flt_6BE3A4_debug_recmod1 * 2.133333333333333));
3210 ++v84; 3210 ++v84;
3211 } 3211 }
3212 while ( (signed int)v84 <= (signed int)&pPlayers[4] ); 3212 while ( (signed int)v84 <= (signed int)&pPlayers[4] );
3213 v82 = pParty->vPosition.z; 3213 v82 = pParty->vPosition.z;
14550 v8 = &pPlayers[1]; 14550 v8 = &pPlayers[1];
14551 do 14551 do
14552 { 14552 {
14553 pPlayer = *v8; 14553 pPlayer = *v8;
14554 if ( !(*v8)->pConditions[14] && !pPlayer->pConditions[15] && !pPlayer->pConditions[16] ) 14554 if ( !(*v8)->pConditions[14] && !pPlayer->pConditions[15] && !pPlayer->pConditions[16] )
14555 pPlayer->ReceiveDamage(v4, 5); 14555 pPlayer->ReceiveDamage(v4, DMGT_5);
14556 ++v8; 14556 ++v8;
14557 } 14557 }
14558 while ( (signed int)v8 <= (signed int)&pPlayers[4] ); 14558 while ( (signed int)v8 <= (signed int)&pPlayers[4] );
14559 //v0 = 0; 14559 //v0 = 0;
14560 } 14560 }