Mercurial > mm7

comparison Party.cpp @ 1520:d023247ae118

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed #62
author yoctozepto
date Wed, 04 Sep 2013 20:24:16 +0200
parents 2ca62c9e7b3c
children 5c7316d3e038
comparison
equal deleted inserted replaced
1519:4c787c28ddce 1520:d023247ae118
1220 //----- (0041F5BE) -------------------------------------------------------- 1220 //----- (0041F5BE) --------------------------------------------------------
1221 void Sleep6Hours() 1221 void Sleep6Hours()
1222 { 1222 {
1223 if ( _506F18_num_minutes_to_sleep < 6 ) 1223 if ( _506F18_num_minutes_to_sleep < 6 )
1224 { 1224 {
1225 pParty->pPlayers[3].SetAsleep(false);
1226 pParty->pPlayers[2].SetAsleep(false);
1227 pParty->pPlayers[1].SetAsleep(false);
1228 pParty->pPlayers[0].SetAsleep(false);
1229 if ( _506F18_num_minutes_to_sleep ) 1225 if ( _506F18_num_minutes_to_sleep )
1230 { 1226 {
1231 Rest(_506F18_num_minutes_to_sleep); 1227 Rest(_506F18_num_minutes_to_sleep);
1232 _506F18_num_minutes_to_sleep = 0; 1228 _506F18_num_minutes_to_sleep = 0;
1233 LoadActualSkyFrame(); 1229 LoadActualSkyFrame();
1234 } 1230 }
1235 if ( dword_506F14 == 2 ) 1231 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
1236 {
1237 pGUIWindow_CurrentMenu->Release();
1238 pEventTimer->Resume();
1239 if ( pTexture_RestUI_CurrentSkyFrame )
1240 pTexture_RestUI_CurrentSkyFrame->Release();
1241 if ( pTexture_RestUI_CurrentHourglassFrame )
1242 pTexture_RestUI_CurrentHourglassFrame->Release();
1243 pTexture_RestUI_CurrentHourglassFrame = 0;
1244 pTexture_RestUI_CurrentSkyFrame = 0;
1245 pIcons_LOD->RemoveTexturesPackFromTextureList();
1246 pIcons_LOD->SyncLoadedFilesCount();
1247 pCurrentScreen = SCREEN_GAME;
1248 viewparams->bRedrawGameUI = 1;
1249 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
1250 {
1251 pOutdoor->UpdateSunlightVectors();
1252 pOutdoor->UpdateFog();
1253 }
1254 }
1255 dword_506F14 = 0;
1256 } 1232 }
1257 else 1233 else
1258 { 1234 {
1259 Rest(6u); 1235 Rest(6u);
1260 _506F18_num_minutes_to_sleep -= 6; 1236 _506F18_num_minutes_to_sleep -= 6;