Mercurial > mm7

comparison UI/UIHouses.cpp @ 1407:d4f57df4c299

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PlayerSpeechID and uSpeakingCharacter
author Ritor1
date Tue, 23 Jul 2013 16:34:00 +0600
parents e6908823897f
children 2423bc2af692
comparison
equal deleted inserted replaced
1406:d071e0e9ba75 1407:d4f57df4c299
585 } 585 }
586 } 586 }
587 //----- (004B1E92) -------------------------------------------------------- 587 //----- (004B1E92) --------------------------------------------------------
588 void PlayHouseSound(unsigned int uHouseID, HouseSoundID sound) 588 void PlayHouseSound(unsigned int uHouseID, HouseSoundID sound)
589 { 589 {
590 //if ( BYTE1(pAnimatedRooms[p2DEvents_minus1___02[26 * uHouseID]].field_C) ) 590 if ( pAnimatedRooms[p2DEvents[uHouseID].uAnimationID].uRoomSoundId )
591 if ( pAnimatedRooms[p2DEvents[uHouseID].uAnimationID].uRoomSoundId ) 591 pAudioPlayer->PlaySound((SoundID)(sound + 100 * (pAnimatedRooms[p2DEvents[uHouseID].uAnimationID].uRoomSoundId + 300)),
592 pAudioPlayer->PlaySound(
593 //(SoundID)(a2 + 100 * (BYTE1(pAnimatedRooms[p2DEvents_minus1___02[26 * uHouseID]].field_C) + 300)),
594 (SoundID)(sound + 100 * (pAnimatedRooms[p2DEvents[uHouseID].uAnimationID].uRoomSoundId + 300)),
595 806, 0, -1, 0, 0, 0, 0); 592 806, 0, -1, 0, 0, 0, 0);
596 } 593 }
597 594
598 //----- (004BCACC) -------------------------------------------------------- 595 //----- (004BCACC) --------------------------------------------------------
599 void __fastcall OnSelectShopDialogueOption(signed int uMessageParam) 596 void __fastcall OnSelectShopDialogueOption(signed int uMessageParam)
2536 Party::TakeGold((unsigned int)pOutString); 2533 Party::TakeGold((unsigned int)pOutString);
2537 v27 = (int)window_SpeakInHouse->ptr_1C;//107 2534 v27 = (int)window_SpeakInHouse->ptr_1C;//107
2538 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful); 2535 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
2539 dialog_menu_id = HOUSE_DIALOGUE_NULL; 2536 dialog_menu_id = HOUSE_DIALOGUE_NULL;
2540 sub_4BD8B5(); 2537 sub_4BD8B5();
2541 sub_4B1D27(); 2538 GetHouseGoodbyeSpeech();
2542 pVideoPlayer->Unload(); 2539 pVideoPlayer->Unload();
2543 window_SpeakInHouse->Release(); 2540 window_SpeakInHouse->Release();
2544 window_SpeakInHouse = 0; 2541 window_SpeakInHouse = 0;
2545 if ( pMessageQueue_50CBD0->uNumMessages ) 2542 if ( pMessageQueue_50CBD0->uNumMessages )
2546 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 2543 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;