Mercurial > mm7

comparison mm7_4.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 f39fbeb65b28
children f24fb0d64a5c cf2fbac6edc9
comparison
equal deleted inserted replaced
756:3523c3b581e5 758:9f7db515a8d7
3728 } 3728 }
3729 } 3729 }
3730 } 3730 }
3731 3731
3732 //----- (00494820) -------------------------------------------------------- 3732 //----- (00494820) --------------------------------------------------------
3733 unsigned int __fastcall sub_494820(unsigned int a1) 3733 unsigned int __fastcall _494820_training_time(unsigned int a1)
3734 { 3734 {
3735 signed int v1; // eax@1 3735 signed int v1; // eax@1
3736 3736
3737 v1 = 5; 3737 v1 = 5;
3738 if ( a1 % 0x18 >= 5 ) 3738 if ( a1 % 24 >= 5 )
3739 v1 = 29; 3739 v1 = 29;
3740 return v1 - a1 % 0x18; 3740 return v1 - a1 % 24;
3741 } 3741 }
3742 3742
3743 //----- (00494836) -------------------------------------------------------- 3743 //----- (00494836) --------------------------------------------------------
3744 int stru339_spell_sound::_494836(int uSoundID, int a6) 3744 int stru339_spell_sound::_494836(int uSoundID, int a6)
3745 { 3745 {
7205 v4.uFrameWidth = 148; 7205 v4.uFrameWidth = 148;
7206 v4.uFrameZ = 334; 7206 v4.uFrameZ = 334;
7207 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[427], pPlayer->pName, pGlobalTXT_LocalizationStrings[562]);// 7207 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[427], pPlayer->pName, pGlobalTXT_LocalizationStrings[562]);//
7208 // "%s is in no condition to %s" 7208 // "%s is in no condition to %s"
7209 // "do anything" 7209 // "do anything"
7210 v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 7210 v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(255, 255, 0x9Bu);
7211 v3 = pFontArrus->CalcTextHeight(pTmpBuf, &v4, 0, 0); 7211 v3 = pFontArrus->CalcTextHeight(pTmpBuf, &v4, 0, 0);
7212 v4.DrawTitleText(pFontArrus, 0, (212 - v3) / 2 + 101, v2, pTmpBuf, 3u); 7212 v4.DrawTitleText(pFontArrus, 0, (212 - v3) / 2 + 101, v2, pTmpBuf, 3u);
7213 result = 0; 7213 result = 0;
7214 } 7214 }
7215 return result; 7215 return result;
9791 pParty->vPosition.y = v7; 9791 pParty->vPosition.y = v7;
9792 pParty->vPosition.z = v5->field_14; 9792 pParty->vPosition.z = v5->field_14;
9793 pParty->uFallStartY = pParty->vPosition.z; 9793 pParty->uFallStartY = pParty->vPosition.z;
9794 pParty->sRotationY = v5->field_18; 9794 pParty->sRotationY = v5->field_18;
9795 } 9795 }
9796 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney); 9796 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
9797 v12 = v5->uTravelTime; 9797 v12 = v5->uTravelTime;
9798 int _v47; 9798 int _v47;
9799 if ( (signed int)window_SpeakInHouse->ptr_1C >= 63 ) 9799 if ( (signed int)window_SpeakInHouse->ptr_1C >= 63 )
9800 { 9800 {
9801 v63 = SPEECH_SetSail; 9801 v63 = SPEECH_SetSail;