diff mm7_3.cpp @ 1036:7f8be9f9769e

player recieve damage
author Gloval
date Wed, 22 May 2013 22:25:44 +0400
parents 3a5c8df8381d
children ff2d888f8033
line wrap: on
line diff
--- a/mm7_3.cpp	Tue May 21 23:45:26 2013 +0200
+++ b/mm7_3.cpp	Wed May 22 22:25:44 2013 +0400
@@ -1662,8 +1662,8 @@
       auto player = pParty->pPlayers + i;
       if (!player->HasEnchantedItemEquipped(72) && !player->WearsItem(ITEM_ARTIFACT_HERMES_SANDALS, 8))
       {
-        player->ReceiveDamage((pParty->uFallStartY - party_z) * (0.1f * player->GetMaxHealth()) / 256, 4);
-        v10 = (double)(20 - player->_48EA1B_get_static_effect(player->GetActualEndurance())) * flt_6BE3A4_debug_recmod1 * 2.133333333333333;
+        player->ReceiveDamage((pParty->uFallStartY - party_z) * (0.1f * player->GetMaxHealth()) / 256, DMGT_PHISYCAL);
+        v10 = (double)(20 - player->GetParameterBonus(player->GetActualEndurance())) * flt_6BE3A4_debug_recmod1 * 2.133333333333333;
         player->SetRecoveryTime((signed __int64)v10);
       }
     }
@@ -2301,8 +2301,8 @@
       {
         player->ReceiveDamage(
             (signed int)((pParty->uFallStartY - pZ) * (unsigned __int64)(player->GetMaxHealth() / 10)) / 256,
-            4);
-        v105 = 20 - player->_48EA1B_get_static_effect(player->GetActualEndurance());
+            DMGT_PHISYCAL);
+        v105 = 20 - player->GetParameterBonus(player->GetActualEndurance());
         player->SetRecoveryTime((signed __int64)((double)v105 * flt_6BE3A4_debug_recmod1 * 2.133333333333333));
       }
       //}
@@ -3081,9 +3081,9 @@
               v110 = (*v74)->GetMaxHealth();
               (*v74)->ReceiveDamage(
                 (signed int)((pParty->uFallStartY - v70) * (unsigned __int64)(signed __int64)((double)v110 * 0.1)) / 256,
-                4);
+                DMGT_PHISYCAL);
               v75 = (*v74)->GetActualEndurance();
-              v110 = 20 - (*v74)->_48EA1B_get_static_effect(v75);
+              v110 = 20 - (*v74)->GetParameterBonus(v75);
               (*v74)->SetRecoveryTime(
                 (signed __int64)((double)v110 * flt_6BE3A4_debug_recmod1 * 2.133333333333333));
               ++v74;
@@ -3203,9 +3203,9 @@
             v110 = (*v84)->GetMaxHealth();
             (*v84)->ReceiveDamage(
               (signed int)((pParty->uFallStartY - v81) * (unsigned __int64)(signed __int64)((double)v110 * 0.1)) / 256,
-              4);
+              DMGT_PHISYCAL);
             v85 = (*v84)->GetActualEndurance();
-            v110 = 20 - (*v84)->_48EA1B_get_static_effect(v85);
+            v110 = 20 - (*v84)->GetParameterBonus(v85);
             (*v84)->SetRecoveryTime((signed __int64)((double)v110 * flt_6BE3A4_debug_recmod1 * 2.133333333333333));
             ++v84;
           }
@@ -14566,7 +14566,7 @@
 				{
 					pPlayer = *v8;
 					if ( !(*v8)->pConditions[14] && !pPlayer->pConditions[15] && !pPlayer->pConditions[16] )
-						pPlayer->ReceiveDamage(v4, 5);
+						pPlayer->ReceiveDamage(v4, DMGT_5);
 					++v8;
 				}
 				while ( (signed int)v8 <= (signed int)&pPlayers[4] );