Mercurial > mm7

comparison mm7_4.cpp @ 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 87be06553c76 9f4d5a9d6fd8
comparison
equal deleted inserted replaced
2062:c2a004e7458b 2063:7890930801a8
762 } 762 }
763 } 763 }
764 _493938_regenerate(); 764 _493938_regenerate();
765 uint party_condition_flag = 4; 765 uint party_condition_flag = 4;
766 a2a = pEventTimer->uTimeElapsed; 766 a2a = pEventTimer->uTimeElapsed;
767 if ( pParty->uFlags2 & PARTY_FLAGS_2_RUNNING ) 767 if ( pParty->uFlags2 & PARTY_FLAGS_2_RUNNING )//замедление восстановления при беге
768 { 768 {
769 //v19 = (double)(signed int)prev_time * 0.5;
770 //v20 = v19 + 6.7553994e15;
771 a2a *= 0.5f; 769 a2a *= 0.5f;
772 if (a2a < 1) 770 if (a2a < 1)
773 a2a = 1; 771 a2a = 1;
774 } 772 }
775 773
776 for ( uint pl = 1; pl <= 4; pl++ ) 774 for ( uint pl = 1; pl <= 4; pl++ )
777 { 775 {
778 if ( pPlayers[pl]->uTimeToRecovery ) 776 if ( pPlayers[pl]->uTimeToRecovery )
779 pPlayers[pl]->Recover(a2a); 777 pPlayers[pl]->Recover(a2a);//восстановление активности
780 if ( pPlayers[pl]->GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE) + pPlayers[pl]->sHealth + pPlayers[pl]->uEndurance >= 1 778 if ( pPlayers[pl]->GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE) + pPlayers[pl]->sHealth + pPlayers[pl]->uEndurance >= 1
781 || (signed __int64)pPlayers[pl]->pPlayerBuffs[PLAYER_BUFF_PRESERVATION].uExpireTime > 0 ) 779 || (signed __int64)pPlayers[pl]->pPlayerBuffs[PLAYER_BUFF_PRESERVATION].uExpireTime > 0 )
782 { 780 {
783 if ( pPlayers[pl]->sHealth < 1 ) 781 if ( pPlayers[pl]->sHealth < 1 )
784 pPlayers[pl]->SetCondition(Condition_Unconcious, 0); 782 pPlayers[pl]->SetCondition(Condition_Unconcious, 0);