Mercurial > mm7
diff mm7_4.cpp @ 744:4b06e19fcdbc
Слияние
author | Ritor1 |
---|---|
date | Fri, 22 Mar 2013 23:42:21 +0600 |
parents | cd9ae9a2c99c 6daaa2f18d0d |
children | 0b7a55e955f2 |
line wrap: on
line diff
--- a/mm7_4.cpp Fri Mar 22 23:42:09 2013 +0600 +++ b/mm7_4.cpp Fri Mar 22 23:42:21 2013 +0600 @@ -7040,7 +7040,7 @@ DDM_DLV_Header *v7; // eax@14 Player **v8; // edi@18 Player *result; // eax@19 - char *v10; // esi@20 + //char *v10; // esi@20 v3 = 0; if ( a2 ) @@ -7090,10 +7090,10 @@ result = *v8; if ( pParty->uFine ) { - v10 = result->_guilds_member_bits; + //v10 = result->_guilds_member_bits; result = (Player *)_449B57_test_bit((unsigned __int8 *)result->_guilds_member_bits, 1); if ( !(short)result ) - __debugbreak; + __debugbreak(); //result = (Player *)_449B7E_toggle_bit((unsigned char *)v10, 1, 1u); } ++v8; @@ -7350,7 +7350,7 @@ } v1 = (unsigned int)window_SpeakInHouse->ptr_1C; LABEL_28: - HousePlaySomeSound(v1, v0); + PlayHouseSound(v1, (HouseSoundID)v0); return; } v1 = (unsigned int)window_SpeakInHouse->ptr_1C; @@ -7363,7 +7363,7 @@ v0 = 4; goto LABEL_28; } - HousePlaySomeSound(v1, dword_F8B1E4 + 3); + PlayHouseSound(v1, (HouseSoundID)(dword_F8B1E4 + 3)); if ( !dword_F8B1E4 && !qword_A750D8 ) { v5 = 0; @@ -9404,7 +9404,7 @@ *(short *)v6 = 1; v27 = 2; } - HousePlaySomeSound((unsigned int)window_SpeakInHouse->ptr_1C, v27); + PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, (HouseSoundID)v27); } } else @@ -9740,7 +9740,7 @@ if ( pParty->uNumGold < s1 ) { ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u); - HousePlaySomeSound((unsigned int)window_SpeakInHouse->ptr_1C, 3); + PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Greeting_2); /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 ) return; pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; @@ -9784,7 +9784,7 @@ pParty->uFallStartY = pParty->vPosition.z; pParty->sRotationY = v5->field_18; } - HousePlaySomeSound((unsigned int)window_SpeakInHouse->ptr_1C, 2); + PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney); v12 = v5->uTravelTime; int _v47; if ( (signed int)window_SpeakInHouse->ptr_1C >= 63 ) @@ -10466,7 +10466,7 @@ pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Transition, 0, (int)sHouseName); //if ( BYTE1(pAnimatedRooms[p2DEvents_minus1___02[26 * v9]].field_C) ) if ( pAnimatedRooms[p2DEvents[v9 - 1].uAnimationID].uRoomSoundId ) - HousePlaySomeSound(v9, 1); + PlayHouseSound(v9, HouseSound_Greeting); if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 ) pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0); result = v23;