Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
1360:a47d9282ea7c 1361:b3ac17fd12de
2486 if ( uMessageParam == 111 || uMessageParam == 114 || uMessageParam == 116 ) 2486 if ( uMessageParam == 111 || uMessageParam == 114 || uMessageParam == 116 )
2487 _506F18_num_hours_to_sleep = v86 + 720; 2487 _506F18_num_hours_to_sleep = v86 + 720;
2488 dword_506F14 = 2; 2488 dword_506F14 = 2;
2489 pParty->RestAndHeal(); 2489 pParty->RestAndHeal();
2490 pParty->days_played_without_rest = 0; 2490 pParty->days_played_without_rest = 0;
2491 pParty->pPlayers[3].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed; 2491 pParty->pPlayers[3].SetAsleep(1);
2492 pParty->pPlayers[2].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed; 2492 pParty->pPlayers[2].SetAsleep(1);
2493 pParty->pPlayers[1].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed; 2493 pParty->pPlayers[1].SetAsleep(1);
2494 pParty->pPlayers[0].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed; 2494 pParty->pPlayers[0].SetAsleep(1);
2495 continue; 2495 continue;
2496 case UIMSG_RestWindow: 2496 case UIMSG_RestWindow:
2497 if ( pMessageQueue_50CBD0->uNumMessages ) 2497 if ( pMessageQueue_50CBD0->uNumMessages )
2498 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 2498 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
2499 if ( pCurrentScreen ) 2499 if ( pCurrentScreen )
2596 Party::TakeFood(uRestUI_FoodRequiredToRest); 2596 Party::TakeFood(uRestUI_FoodRequiredToRest);
2597 _506F18_num_hours_to_sleep = 480; 2597 _506F18_num_hours_to_sleep = 480;
2598 dword_506F14 = 2; 2598 dword_506F14 = 2;
2599 pParty->RestAndHeal(); 2599 pParty->RestAndHeal();
2600 pParty->days_played_without_rest = 0; 2600 pParty->days_played_without_rest = 0;
2601 pParty->pPlayers[3].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed; 2601 pParty->pPlayers[3].SetAsleep(1);
2602 pParty->pPlayers[2].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed; 2602 pParty->pPlayers[2].SetAsleep(1);
2603 pParty->pPlayers[1].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed; 2603 pParty->pPlayers[1].SetAsleep(1);
2604 pParty->pPlayers[0].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed; 2604 pParty->pPlayers[0].SetAsleep(1);
2605 } 2605 }
2606 continue; 2606 continue;
2607 case UIMSG_AlreadyResting: 2607 case UIMSG_AlreadyResting:
2608 if ( dword_506F14 == 2 ) 2608 if ( dword_506F14 == 2 )
2609 { 2609 {