Mercurial > mm7

changeset 2063:7890930801a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small fix
author Ritor1
date Mon, 02 Dec 2013 20:42:46 +0600
parents c2a004e7458b
children 74f06d8a8017
files Party.cpp mm7_4.cpp
diffstat 2 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Party.cpp	Mon Dec 02 19:51:19 2013 +0600
+++ b/Party.cpp	Mon Dec 02 20:42:46 2013 +0600
@@ -812,9 +812,9 @@
     InitializeActors();
   v2 = (signed __int64)((7680 * uHoursToSleep) * 0.033333335);
   pParty->uTimePlayed += v2;
-  for (int i = 0; i < 4; i++)
+  for (int i = 1; i <= 4; i++)
   {
-    pPlayers[i + 1]->Recover((int)v2);
+    pPlayers[i]->Recover((int)v2);
   }
   _494035_timed_effects__water_walking_damage__etc();
 }
--- a/mm7_4.cpp	Mon Dec 02 19:51:19 2013 +0600
+++ b/mm7_4.cpp	Mon Dec 02 20:42:46 2013 +0600
@@ -764,10 +764,8 @@
   _493938_regenerate();
   uint party_condition_flag = 4;
   a2a = pEventTimer->uTimeElapsed;
-  if ( pParty->uFlags2 & PARTY_FLAGS_2_RUNNING )
+  if ( pParty->uFlags2 & PARTY_FLAGS_2_RUNNING )//замедление восстановления при беге
   {
-    //v19 = (double)(signed int)prev_time * 0.5;
-    //v20 = v19 + 6.7553994e15;
     a2a *= 0.5f;
     if (a2a < 1)
       a2a = 1;
@@ -776,7 +774,7 @@
   for ( uint pl = 1; pl <= 4; pl++ )
   {
     if ( pPlayers[pl]->uTimeToRecovery )
-      pPlayers[pl]->Recover(a2a);
+      pPlayers[pl]->Recover(a2a);//восстановление активности
     if ( pPlayers[pl]->GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE) + pPlayers[pl]->sHealth + pPlayers[pl]->uEndurance >= 1
       || (signed __int64)pPlayers[pl]->pPlayerBuffs[PLAYER_BUFF_PRESERVATION].uExpireTime > 0 )
     {