Mercurial > mm7
diff Party.cpp @ 2071:9f4d5a9d6fd8
Merge
author | Nomad |
---|---|
date | Tue, 03 Dec 2013 21:29:12 +0200 |
parents | 7890930801a8 |
children | d28d3c006077 |
line wrap: on
line diff
--- a/Party.cpp Tue Dec 03 21:25:05 2013 +0200 +++ b/Party.cpp Tue Dec 03 21:29:12 2013 +0200 @@ -160,7 +160,6 @@ int Party::GetNextActiveCharacter() { int v2; // eax@4 - Player *v6; // eax@7 signed int v8; // esi@23 int v12; // [sp+Ch] [bp-4h]@1 @@ -177,12 +176,8 @@ playerAlreadyPicked.fill(false); for (int i = 0; i < 4; i++) { - v6 = &this->pPlayers[i]; - if ( !v6->CanAct() - || v6->uTimeToRecovery > 0) - { + if ( !this->pPlayers[i].CanAct() || this->pPlayers[i].uTimeToRecovery > 0) playerAlreadyPicked[i] = true; - } else if ( !playerAlreadyPicked[i] ) { playerAlreadyPicked[i] = true; @@ -194,8 +189,7 @@ for (int i = 0; i < 4; i++) { - if ( this->pPlayers[i].CanAct() - && this->pPlayers[i].uTimeToRecovery == 0 ) + if ( this->pPlayers[i].CanAct() && this->pPlayers[i].uTimeToRecovery == 0 ) { if ( v12 == 0 || this->pPlayers[i].uSpeedBonus > v8 ) { @@ -818,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(); }