Mercurial > mm7

diff mm7_5.cpp @ 1361:b3ac17fd12de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved condition checking to a separate class, extracted it from player::SetCondition
author Grumpy7
date Sun, 14 Jul 2013 23:22:43 +0200
parents 61010a655c94
children b51332ab228f 5a5d0c713d47
line wrap: on
line diff
--- a/mm7_5.cpp	Sat Jul 13 21:36:35 2013 +0200
+++ b/mm7_5.cpp	Sun Jul 14 23:22:43 2013 +0200
@@ -2488,10 +2488,10 @@
           dword_506F14 = 2;
           pParty->RestAndHeal();
           pParty->days_played_without_rest = 0;
-          pParty->pPlayers[3].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
-          pParty->pPlayers[2].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
-          pParty->pPlayers[1].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
-          pParty->pPlayers[0].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
+          pParty->pPlayers[3].SetAsleep(1);
+          pParty->pPlayers[2].SetAsleep(1);
+          pParty->pPlayers[1].SetAsleep(1);
+          pParty->pPlayers[0].SetAsleep(1);
           continue;
         case UIMSG_RestWindow:
           if ( pMessageQueue_50CBD0->uNumMessages )
@@ -2598,10 +2598,10 @@
             dword_506F14 = 2;
             pParty->RestAndHeal();
             pParty->days_played_without_rest = 0;
-            pParty->pPlayers[3].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
-            pParty->pPlayers[2].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
-            pParty->pPlayers[1].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
-            pParty->pPlayers[0].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
+            pParty->pPlayers[3].SetAsleep(1);
+            pParty->pPlayers[2].SetAsleep(1);
+            pParty->pPlayers[1].SetAsleep(1);
+            pParty->pPlayers[0].SetAsleep(1);
           }
           continue;
         case UIMSG_AlreadyResting: