Mercurial > mm7

comparison mm7_5.cpp @ 766:a464d28566a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
days_played_without_rest
author Nomad
date Sat, 23 Mar 2013 20:22:51 +0200
parents cf2fbac6edc9
children c47efaf23642 b27dd658ea77
comparison
equal deleted inserted replaced
763:a84db04439a4 766:a464d28566a6
1692 { 1692 {
1693 pPlayer7->SetCondition(v0, 0); 1693 pPlayer7->SetCondition(v0, 0);
1694 ++pPlayer7; 1694 ++pPlayer7;
1695 } 1695 }
1696 while ( (signed int)pPlayer7 < (signed int)pParty->pHirelings ); 1696 while ( (signed int)pPlayer7 < (signed int)pParty->pHirelings );
1697 ++pParty->field_764; 1697 ++pParty->days_played_without_rest;
1698 } 1698 }
1699 Party::TakeFood((unsigned int)pNPCData4); 1699 Party::TakeFood((unsigned int)pNPCData4);
1700 } 1700 }
1701 else 1701 else
1702 { 1702 {
1705 { 1705 {
1706 pPlayer8->SetCondition(v0, 0); 1706 pPlayer8->SetCondition(v0, 0);
1707 ++pPlayer8; 1707 ++pPlayer8;
1708 } 1708 }
1709 while ( (signed int)pPlayer8 < (signed int)pParty->pHirelings ); 1709 while ( (signed int)pPlayer8 < (signed int)pParty->pHirelings );
1710 ++pParty->field_764; 1710 ++pParty->days_played_without_rest;
1711 } 1711 }
1712 pPaletteManager->ResetNonLocked(); 1712 pPaletteManager->ResetNonLocked();
1713 pSpriteFrameTable->ResetSomeSpriteFlags(); 1713 pSpriteFrameTable->ResetSomeSpriteFlags();
1714 strcpy(pCurrentMapName, &pOut); 1714 strcpy(pCurrentMapName, &pOut);
1715 strcpy(&pLevelName, pCurrentMapName); 1715 strcpy(&pLevelName, pCurrentMapName);
2566 if ( uMessageParam == 111 || uMessageParam == 114 || uMessageParam == 116 ) 2566 if ( uMessageParam == 111 || uMessageParam == 114 || uMessageParam == 116 )
2567 _506F18_num_hours_to_sleep = v86 + 720; 2567 _506F18_num_hours_to_sleep = v86 + 720;
2568 //goto LABEL_615; 2568 //goto LABEL_615;
2569 dword_506F14 = 2; 2569 dword_506F14 = 2;
2570 pParty->RestAndHeal(); 2570 pParty->RestAndHeal();
2571 pParty->field_764 = 0; 2571 pParty->days_played_without_rest = 0;
2572 pParty->pPlayers[3].pConditions[2] = pParty->uTimePlayed; 2572 pParty->pPlayers[3].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
2573 pParty->pPlayers[2].pConditions[2] = pParty->uTimePlayed; 2573 pParty->pPlayers[2].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
2574 pParty->pPlayers[1].pConditions[2] = pParty->uTimePlayed; 2574 pParty->pPlayers[1].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
2575 pParty->pPlayers[0].pConditions[2] = pParty->uTimePlayed; 2575 pParty->pPlayers[0].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
2576 continue; 2576 continue;
2577 case UIMSG_68: 2577 case UIMSG_68:
2578 if ( pMessageQueue_50CBD0->uNumMessages ) 2578 if ( pMessageQueue_50CBD0->uNumMessages )
2579 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 2579 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
2580 if ( pCurrentScreen ) 2580 if ( pCurrentScreen )
2713 Party::TakeFood(uRestUI_FoodRequiredToRest); 2713 Party::TakeFood(uRestUI_FoodRequiredToRest);
2714 _506F18_num_hours_to_sleep = 480; 2714 _506F18_num_hours_to_sleep = 480;
2715 //LABEL_615: 2715 //LABEL_615:
2716 dword_506F14 = 2; 2716 dword_506F14 = 2;
2717 pParty->RestAndHeal(); 2717 pParty->RestAndHeal();
2718 pParty->field_764 = 0; 2718 pParty->days_played_without_rest = 0;
2719 pParty->pPlayers[3].pConditions[2] = pParty->uTimePlayed; 2719 pParty->pPlayers[3].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
2720 pParty->pPlayers[2].pConditions[2] = pParty->uTimePlayed; 2720 pParty->pPlayers[2].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
2721 pParty->pPlayers[1].pConditions[2] = pParty->uTimePlayed; 2721 pParty->pPlayers[1].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
2722 pParty->pPlayers[0].pConditions[2] = pParty->uTimePlayed; 2722 pParty->pPlayers[0].pConditions[Player::Condition_Sleep] = pParty->uTimePlayed;
2723 } 2723 }
2724 continue; 2724 continue;
2725 case UIMSG_AlreadyResting: 2725 case UIMSG_AlreadyResting:
2726 if ( dword_506F14 == 2 ) 2726 if ( dword_506F14 == 2 )
2727 { 2727 {