Mercurial > mm7
changeset 1240:353cb3ad9725
m
| author | Ritor1 |
|---|---|
| date | Mon, 10 Jun 2013 00:57:51 +0600 |
| parents | 7f4d7597fa2d |
| children | 30df39a3aa92 21a46b38ca24 |
| files | UIHouses.cpp UITransition.cpp |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/UIHouses.cpp Mon Jun 10 00:37:21 2013 +0600 +++ b/UIHouses.cpp Mon Jun 10 00:57:51 2013 +0600 @@ -565,10 +565,10 @@ void PlayHouseSound(unsigned int uHouseID, HouseSoundID sound) { //if ( BYTE1(pAnimatedRooms[p2DEvents_minus1___02[26 * uHouseID]].field_C) ) - if ( pAnimatedRooms[p2DEvents[uHouseID].uAnimationID].uRoomSoundId ) //temporarily changing uHouseID - 1 to uHouseID + if ( pAnimatedRooms[p2DEvents[uHouseID - 1].uAnimationID].uRoomSoundId ) pAudioPlayer->PlaySound( //(SoundID)(a2 + 100 * (BYTE1(pAnimatedRooms[p2DEvents_minus1___02[26 * uHouseID]].field_C) + 300)), - (SoundID)(sound + 100 * (pAnimatedRooms[p2DEvents[uHouseID].uAnimationID].uRoomSoundId + 300)), //temporarily changing uHouseID - 1 to uHouseID + (SoundID)(sound + 100 * (pAnimatedRooms[p2DEvents[uHouseID - 1].uAnimationID].uRoomSoundId + 300)), 806, 0, -1, 0, 0, 0, 0); }
--- a/UITransition.cpp Mon Jun 10 00:37:21 2013 +0600 +++ b/UITransition.cpp Mon Jun 10 00:57:51 2013 +0600 @@ -132,7 +132,7 @@ LABEL_20: pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Transition, 0, (int)sHouseName.data()); //if ( BYTE1(pAnimatedRooms[p2DEvents_minus1___02[26 * v9]].field_C) ) - if ( pAnimatedRooms[p2DEvents[anim_id].uAnimationID].uRoomSoundId ) //temporarily changing anim_id - 1 to anim_id + if ( pAnimatedRooms[p2DEvents[anim_id - 1].uAnimationID].uRoomSoundId ) PlayHouseSound(anim_id, HouseSound_Greeting); if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 ) pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0);