Mercurial > mm7

comparison mm7_4.cpp @ 744:4b06e19fcdbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 22 Mar 2013 23:42:21 +0600
parents cd9ae9a2c99c 6daaa2f18d0d
children 0b7a55e955f2
comparison
equal deleted inserted replaced
743:353ff9ea11e6 744:4b06e19fcdbc
7038 int v5; // eax@8 7038 int v5; // eax@8
7039 unsigned __int64 v6; // qax@12 7039 unsigned __int64 v6; // qax@12
7040 DDM_DLV_Header *v7; // eax@14 7040 DDM_DLV_Header *v7; // eax@14
7041 Player **v8; // edi@18 7041 Player **v8; // edi@18
7042 Player *result; // eax@19 7042 Player *result; // eax@19
7043 char *v10; // esi@20 7043 //char *v10; // esi@20
7044 7044
7045 v3 = 0; 7045 v3 = 0;
7046 if ( a2 ) 7046 if ( a2 )
7047 { 7047 {
7048 if ( a2 != 1 ) 7048 if ( a2 != 1 )
7088 do 7088 do
7089 { 7089 {
7090 result = *v8; 7090 result = *v8;
7091 if ( pParty->uFine ) 7091 if ( pParty->uFine )
7092 { 7092 {
7093 v10 = result->_guilds_member_bits; 7093 //v10 = result->_guilds_member_bits;
7094 result = (Player *)_449B57_test_bit((unsigned __int8 *)result->_guilds_member_bits, 1); 7094 result = (Player *)_449B57_test_bit((unsigned __int8 *)result->_guilds_member_bits, 1);
7095 if ( !(short)result ) 7095 if ( !(short)result )
7096 __debugbreak; 7096 __debugbreak();
7097 //result = (Player *)_449B7E_toggle_bit((unsigned char *)v10, 1, 1u); 7097 //result = (Player *)_449B7E_toggle_bit((unsigned char *)v10, 1, 1u);
7098 } 7098 }
7099 ++v8; 7099 ++v8;
7100 } 7100 }
7101 while ( (signed int)v8 <= (signed int)&pPlayers[4] ); 7101 while ( (signed int)v8 <= (signed int)&pPlayers[4] );
7348 if ( in_current_building_type != BildingType_Temple ) 7348 if ( in_current_building_type != BildingType_Temple )
7349 return; 7349 return;
7350 } 7350 }
7351 v1 = (unsigned int)window_SpeakInHouse->ptr_1C; 7351 v1 = (unsigned int)window_SpeakInHouse->ptr_1C;
7352 LABEL_28: 7352 LABEL_28:
7353 HousePlaySomeSound(v1, v0); 7353 PlayHouseSound(v1, (HouseSoundID)v0);
7354 return; 7354 return;
7355 } 7355 }
7356 v1 = (unsigned int)window_SpeakInHouse->ptr_1C; 7356 v1 = (unsigned int)window_SpeakInHouse->ptr_1C;
7357 if ( (signed __int64)pParty->field_3C._shop_ban_times[v1 ]<= (signed __int64)pParty->uTimePlayed ) 7357 if ( (signed __int64)pParty->field_3C._shop_ban_times[v1 ]<= (signed __int64)pParty->uTimePlayed )
7358 { 7358 {
7361 if ( !dword_F8B1E4 ) 7361 if ( !dword_F8B1E4 )
7362 return; 7362 return;
7363 v0 = 4; 7363 v0 = 4;
7364 goto LABEL_28; 7364 goto LABEL_28;
7365 } 7365 }
7366 HousePlaySomeSound(v1, dword_F8B1E4 + 3); 7366 PlayHouseSound(v1, (HouseSoundID)(dword_F8B1E4 + 3));
7367 if ( !dword_F8B1E4 && !qword_A750D8 ) 7367 if ( !dword_F8B1E4 && !qword_A750D8 )
7368 { 7368 {
7369 v5 = 0; 7369 v5 = 0;
7370 v6 = 1; 7370 v6 = 1;
7371 do 7371 do
9402 { 9402 {
9403 Party::TakeGold(v4); 9403 Party::TakeGold(v4);
9404 *(short *)v6 = 1; 9404 *(short *)v6 = 1;
9405 v27 = 2; 9405 v27 = 2;
9406 } 9406 }
9407 HousePlaySomeSound((unsigned int)window_SpeakInHouse->ptr_1C, v27); 9407 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, (HouseSoundID)v27);
9408 } 9408 }
9409 } 9409 }
9410 else 9410 else
9411 { 9411 {
9412 v5 = 0; 9412 v5 = 0;
9738 if ( dialog_menu_id > 104 && dialog_menu_id <= 108 ) 9738 if ( dialog_menu_id > 104 && dialog_menu_id <= 108 )
9739 { 9739 {
9740 if ( pParty->uNumGold < s1 ) 9740 if ( pParty->uNumGold < s1 )
9741 { 9741 {
9742 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u); 9742 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u);
9743 HousePlaySomeSound((unsigned int)window_SpeakInHouse->ptr_1C, 3); 9743 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Greeting_2);
9744 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 ) 9744 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 )
9745 return; 9745 return;
9746 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; 9746 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;
9747 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 1; 9747 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 1;
9748 goto LABEL_33;*/ 9748 goto LABEL_33;*/
9782 pParty->vPosition.y = v7; 9782 pParty->vPosition.y = v7;
9783 pParty->vPosition.z = v5->field_14; 9783 pParty->vPosition.z = v5->field_14;
9784 pParty->uFallStartY = pParty->vPosition.z; 9784 pParty->uFallStartY = pParty->vPosition.z;
9785 pParty->sRotationY = v5->field_18; 9785 pParty->sRotationY = v5->field_18;
9786 } 9786 }
9787 HousePlaySomeSound((unsigned int)window_SpeakInHouse->ptr_1C, 2); 9787 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney);
9788 v12 = v5->uTravelTime; 9788 v12 = v5->uTravelTime;
9789 int _v47; 9789 int _v47;
9790 if ( (signed int)window_SpeakInHouse->ptr_1C >= 63 ) 9790 if ( (signed int)window_SpeakInHouse->ptr_1C >= 63 )
9791 { 9791 {
9792 v63 = SPEECH_SetSail; 9792 v63 = SPEECH_SetSail;
10464 strcpy(sHouseName, v21); 10464 strcpy(sHouseName, v21);
10465 LABEL_20: 10465 LABEL_20:
10466 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Transition, 0, (int)sHouseName); 10466 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Transition, 0, (int)sHouseName);
10467 //if ( BYTE1(pAnimatedRooms[p2DEvents_minus1___02[26 * v9]].field_C) ) 10467 //if ( BYTE1(pAnimatedRooms[p2DEvents_minus1___02[26 * v9]].field_C) )
10468 if ( pAnimatedRooms[p2DEvents[v9 - 1].uAnimationID].uRoomSoundId ) 10468 if ( pAnimatedRooms[p2DEvents[v9 - 1].uAnimationID].uRoomSoundId )
10469 HousePlaySomeSound(v9, 1); 10469 PlayHouseSound(v9, HouseSound_Greeting);
10470 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 ) 10470 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 )
10471 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0); 10471 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0);
10472 result = v23; 10472 result = v23;
10473 if ( v23 ) 10473 if ( v23 )
10474 uCurrentHouse_Animation = v23; 10474 uCurrentHouse_Animation = v23;