Mercurial > mm7

comparison mm7_5.cpp @ 758:9f7db515a8d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Training Hall & levelling up fixed
author Nomad
date Sat, 23 Mar 2013 13:38:24 +0200
parents 6daaa2f18d0d
children cf2fbac6edc9
comparison
equal deleted inserted replaced
756:3523c3b581e5 758:9f7db515a8d7
1577 case UIMSG_TransitionUI_Confirm: 1577 case UIMSG_TransitionUI_Confirm:
1578 if ( pMessageQueue_50CBD0->uNumMessages ) 1578 if ( pMessageQueue_50CBD0->uNumMessages )
1579 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 1579 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
1580 dword_50CDC8 = v0; 1580 dword_50CDC8 = v0;
1581 sub_42FBDD(); 1581 sub_42FBDD();
1582 PlayHouseSound(uCurrentHouse_Animation, HouseSound_NotEnoughMoney); 1582 PlayHouseSound(uCurrentHouse_Animation, HouseSound_NotEnoughMoney_TrainingSuccessful);
1583 pVideoPlayer->Unload(); 1583 pVideoPlayer->Unload();
1584 sub_44603D(); 1584 sub_44603D();
1585 viewparams->bRedrawGameUI = v0; 1585 viewparams->bRedrawGameUI = v0;
1586 if ( dword_59117C_teleportx | dword_591178_teleporty | dword_591174_teleportz | dword_591170_teleport_directiony | dword_59116C_teleport_directionx | dword_591168_teleport_speedz ) 1586 if ( dword_59117C_teleportx | dword_591178_teleporty | dword_591174_teleportz | dword_591170_teleport_directiony | dword_59116C_teleport_directionx | dword_591168_teleport_speedz )
1587 { 1587 {
2559 _506F18_num_hours_to_sleep = 60; 2559 _506F18_num_hours_to_sleep = 60;
2560 continue; 2560 continue;
2561 case UIMSG_OpenRestUI: 2561 case UIMSG_OpenRestUI:
2562 dword_506F14 = 2; 2562 dword_506F14 = 2;
2563 RestUI_Initialize(); 2563 RestUI_Initialize();
2564 v86 = 60 * (sub_494820(pParty->uCurrentHour) + 1) - pParty->uCurrentMinute; 2564 v86 = 60 * (_494820_training_time(pParty->uCurrentHour) + 1) - pParty->uCurrentMinute;
2565 _506F18_num_hours_to_sleep = v86; 2565 _506F18_num_hours_to_sleep = v86;
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;
2731 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); 2731 pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0);
2732 continue; 2732 continue;
2733 } 2733 }
2734 GUIWindow::Create(pButton_RestUI_WaitUntilDawn->uX, pButton_RestUI_WaitUntilDawn->uY, 0, 0, WINDOW_5A, 2734 GUIWindow::Create(pButton_RestUI_WaitUntilDawn->uX, pButton_RestUI_WaitUntilDawn->uY, 0, 0, WINDOW_5A,
2735 (int)pButton_RestUI_WaitUntilDawn, (int)pGlobalTXT_LocalizationStrings[237]);// "Wait until Dawn" 2735 (int)pButton_RestUI_WaitUntilDawn, (int)pGlobalTXT_LocalizationStrings[237]);// "Wait until Dawn"
2736 v97 = sub_494820(pParty->uCurrentHour); 2736 v97 = _494820_training_time(pParty->uCurrentHour);
2737 dword_506F14 = v0; 2737 dword_506F14 = v0;
2738 _506F18_num_hours_to_sleep = 60 * v97 - pParty->uCurrentMinute; 2738 _506F18_num_hours_to_sleep = 60 * v97 - pParty->uCurrentMinute;
2739 continue; 2739 continue;
2740 case UIMSG_4E: 2740 case UIMSG_4E:
2741 if ( quick_spell_at_page && byte_506550 ) 2741 if ( quick_spell_at_page && byte_506550 )