diff mm7_4.cpp @ 758:9f7db515a8d7

Training Hall & levelling up fixed
author Nomad
date Sat, 23 Mar 2013 13:38:24 +0200
parents f39fbeb65b28
children f24fb0d64a5c cf2fbac6edc9
line wrap: on
line diff
--- a/mm7_4.cpp	Sat Mar 23 00:18:02 2013 +0200
+++ b/mm7_4.cpp	Sat Mar 23 13:38:24 2013 +0200
@@ -3730,14 +3730,14 @@
 }
 
 //----- (00494820) --------------------------------------------------------
-unsigned int __fastcall sub_494820(unsigned int a1)
+unsigned int __fastcall _494820_training_time(unsigned int a1)
 {
   signed int v1; // eax@1
 
   v1 = 5;
-  if ( a1 % 0x18 >= 5 )
+  if ( a1 % 24 >= 5 )
     v1 = 29;
-  return v1 - a1 % 0x18;
+  return v1 - a1 % 24;
 }
 
 //----- (00494836) --------------------------------------------------------
@@ -7207,7 +7207,7 @@
     sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[427], pPlayer->pName, pGlobalTXT_LocalizationStrings[562]);// 
                                                 // "%s is in no condition to %s"
                                                 // "do anything"
-    v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
+    v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(255, 255, 0x9Bu);
     v3 = pFontArrus->CalcTextHeight(pTmpBuf, &v4, 0, 0);
     v4.DrawTitleText(pFontArrus, 0, (212 - v3) / 2 + 101, v2, pTmpBuf, 3u);
     result = 0;
@@ -9793,7 +9793,7 @@
           pParty->uFallStartY = pParty->vPosition.z;
           pParty->sRotationY = v5->field_18;
         }
-        PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney);
+        PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
         v12 = v5->uTravelTime;
         int _v47;
         if ( (signed int)window_SpeakInHouse->ptr_1C >= 63 )