Mercurial > mm7

comparison mm7_5.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 4c787c28ddce
children c4ab816fcc5e
comparison
equal deleted inserted replaced
1519:4c787c28ddce 1520:d023247ae118
1244 break; 1244 break;
1245 case SCREEN_REST://close rest screen 1245 case SCREEN_REST://close rest screen
1246 if ( dword_506F14 ) 1246 if ( dword_506F14 )
1247 { 1247 {
1248 Rest(_506F18_num_minutes_to_sleep); 1248 Rest(_506F18_num_minutes_to_sleep);
1249 pParty->pPlayers[3].pConditions[2] = 0i64; 1249 pParty->pPlayers[3].SetAsleep(false);
1250 pParty->pPlayers[2].pConditions[2] = 0i64; 1250 pParty->pPlayers[2].SetAsleep(false);
1251 pParty->pPlayers[1].pConditions[2] = 0i64; 1251 pParty->pPlayers[1].SetAsleep(false);
1252 pParty->pPlayers[0].pConditions[2] = 0i64; 1252 pParty->pPlayers[0].SetAsleep(false);
1253 } 1253 }
1254 pTexture_RestUI_CurrentSkyFrame->Release(); 1254 pTexture_RestUI_CurrentSkyFrame->Release();
1255 pTexture_RestUI_CurrentHourglassFrame->Release(); 1255 pTexture_RestUI_CurrentHourglassFrame->Release();
1256 pTexture_RestUI_CurrentHourglassFrame = 0; 1256 pTexture_RestUI_CurrentHourglassFrame = 0;
1257 pTexture_RestUI_CurrentSkyFrame = 0; 1257 pTexture_RestUI_CurrentSkyFrame = 0;
1258 pIcons_LOD->SyncLoadedFilesCount(); 1258 pIcons_LOD->SyncLoadedFilesCount();
1259 pIcons_LOD->RemoveTexturesPackFromTextureList(); 1259 pIcons_LOD->RemoveTexturesPackFromTextureList();
1260 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
1261 {
1262 pOutdoor->UpdateSunlightVectors();
1263 pOutdoor->UpdateFog();
1264 }
1260 _506F18_num_minutes_to_sleep = 0; 1265 _506F18_num_minutes_to_sleep = 0;
1261 dword_506F14 = 0; 1266 dword_506F14 = 0;
1262 dword_507B94 = 1; 1267 dword_507B94 = 1;
1263 if ( pGUIWindow_Settings ) 1268 if ( pGUIWindow_Settings )
1264 { 1269 {
1273 pMouse->SetCursorBitmap("MICON1"); 1278 pMouse->SetCursorBitmap("MICON1");
1274 GameUI_Footer_TimeLeft = 0; 1279 GameUI_Footer_TimeLeft = 0;
1275 unk_50C9A0 = 0; 1280 unk_50C9A0 = 0;
1276 back_to_game(); 1281 back_to_game();
1277 } 1282 }
1278 } 1283 }
1279 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 ) 1284 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 )
1280 uActiveCharacter = pParty->GetNextActiveCharacter(); 1285 uActiveCharacter = pParty->GetNextActiveCharacter();
1281 pGUIWindow_CurrentMenu->Release(); 1286 pGUIWindow_CurrentMenu->Release();
1282 if ( pGUIWindow_CurrentMenu == window_SpeakInHouse ) 1287 if ( pGUIWindow_CurrentMenu == window_SpeakInHouse )
1283 window_SpeakInHouse = 0; 1288 window_SpeakInHouse = 0;
1284 pGUIWindow_CurrentMenu = 0; 1289 pGUIWindow_CurrentMenu = 0;
1285 pEventTimer->Resume(); 1290 pEventTimer->Resume();
1286 pCurrentScreen = SCREEN_GAME; 1291 pCurrentScreen = SCREEN_GAME;
1287 viewparams->bRedrawGameUI = 1; 1292 viewparams->bRedrawGameUI = 1;
1288 pIcons_LOD->RemoveTexturesFromTextureList(); 1293 pIcons_LOD->RemoveTexturesFromTextureList();
1289 continue; 1294 continue;
1290 case SCREEN_E: 1295 case SCREEN_E:
1291 __debugbreak(); 1296 __debugbreak();
1292 pGUIWindow_CurrentMenu->Release(); 1297 pGUIWindow_CurrentMenu->Release();
1293 pCurrentScreen = SCREEN_HOUSE; 1298 pCurrentScreen = SCREEN_HOUSE;
1294 pIcons_LOD->RemoveTexturesPackFromTextureList(); 1299 pIcons_LOD->RemoveTexturesPackFromTextureList();