Mercurial > mm7

comparison Party.cpp @ 2340:dc822157c98d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moving functions from unsorted_subs.h pt4
author Grumpy7
date Sun, 06 Apr 2014 12:50:35 +0200
parents 1e865e8690ba
children a574a80e7012
comparison
equal deleted inserted replaced
2339:63e1388c5463 2340:dc822157c98d
847 pParty->pPlayers[i].field_1B3B = 0; 847 pParty->pPlayers[i].field_1B3B = 0;
848 } 848 }
849 pParty->UpdatePlayersAndHirelingsEmotions(); 849 pParty->UpdatePlayersAndHirelingsEmotions();
850 } 850 }
851 //----- (0041F5BE) -------------------------------------------------------- 851 //----- (0041F5BE) --------------------------------------------------------
852 void Sleep6Hours() 852 void Party::Sleep6Hours()
853 { 853 {
854 if ( _506F18_num_minutes_to_sleep < 6 ) 854 if ( _506F18_num_minutes_to_sleep < 6 )
855 { 855 {
856 if ( _506F18_num_minutes_to_sleep ) 856 if ( _506F18_num_minutes_to_sleep )
857 { 857 {
858 Rest(_506F18_num_minutes_to_sleep); 858 Rest(_506F18_num_minutes_to_sleep);
859 _506F18_num_minutes_to_sleep = 0; 859 _506F18_num_minutes_to_sleep = 0;
860 LoadActualSkyFrame(); 860 OutdoorLocation::LoadActualSkyFrame();
861 } 861 }
862 if ( dword_506F14 == 2 ) 862 if ( dword_506F14 == 2 )
863 { 863 {
864 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 864 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
865 } 865 }
866 } 866 }
867 else 867 else
868 { 868 {
869 Rest(6u); 869 Rest(6u);
870 _506F18_num_minutes_to_sleep -= 6; 870 _506F18_num_minutes_to_sleep -= 6;
871 LoadActualSkyFrame(); 871 OutdoorLocation::LoadActualSkyFrame();
872 } 872 }
873 viewparams->bRedrawGameUI = 1; 873 viewparams->bRedrawGameUI = 1;
874 } 874 }
875 875
876 bool TestPartyQuestBit( PARTY_QUEST_BITS bit ) 876 bool TestPartyQuestBit( PARTY_QUEST_BITS bit )