Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_5.cpp	Sat Mar 23 00:18:02 2013 +0200
+++ b/mm7_5.cpp	Sat Mar 23 13:38:24 2013 +0200
@@ -1579,7 +1579,7 @@
             pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
           dword_50CDC8 = v0;
           sub_42FBDD();
-          PlayHouseSound(uCurrentHouse_Animation, HouseSound_NotEnoughMoney);
+          PlayHouseSound(uCurrentHouse_Animation, HouseSound_NotEnoughMoney_TrainingSuccessful);
           pVideoPlayer->Unload();
           sub_44603D();
           viewparams->bRedrawGameUI = v0;
@@ -2561,7 +2561,7 @@
         case UIMSG_OpenRestUI:
           dword_506F14 = 2;
           RestUI_Initialize();
-          v86 = 60 * (sub_494820(pParty->uCurrentHour) + 1) - pParty->uCurrentMinute;
+          v86 = 60 * (_494820_training_time(pParty->uCurrentHour) + 1) - pParty->uCurrentMinute;
           _506F18_num_hours_to_sleep = v86;
           if ( uMessageParam == 111 || uMessageParam == 114 || uMessageParam == 116 )
             _506F18_num_hours_to_sleep = v86 + 720;
@@ -2733,7 +2733,7 @@
           }
           GUIWindow::Create(pButton_RestUI_WaitUntilDawn->uX, pButton_RestUI_WaitUntilDawn->uY, 0, 0, WINDOW_5A,
             (int)pButton_RestUI_WaitUntilDawn, (int)pGlobalTXT_LocalizationStrings[237]);// "Wait until Dawn"
-          v97 = sub_494820(pParty->uCurrentHour);
+          v97 = _494820_training_time(pParty->uCurrentHour);
           dword_506F14 = v0;
           _506F18_num_hours_to_sleep = 60 * v97 - pParty->uCurrentMinute;
           continue;