Mercurial > mm7

comparison mm7_4.cpp @ 1808:4002c0fe5efc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 07 Oct 2013 09:31:32 +0600
parents 04b92ce868e3 4dee76d79c78
children bdac32c645c5
comparison
equal deleted inserted replaced
1807:04b92ce868e3 1808:4002c0fe5efc
1402 int *v6; // edi@2 1402 int *v6; // edi@2
1403 unsigned int v7; // eax@3 1403 unsigned int v7; // eax@3
1404 int v8; // [sp+Ch] [bp-8h]@3 1404 int v8; // [sp+Ch] [bp-8h]@3
1405 int v9; // [sp+10h] [bp-4h]@2 1405 int v9; // [sp+10h] [bp-4h]@2
1406 int a2a; // [sp+1Ch] [bp+8h]@1 1406 int a2a; // [sp+1Ch] [bp+8h]@1
1407 1407 return 0;
1408 v3 = 0; 1408 v3 = 0;
1409 result = word_4EE088_sound_ids[uSoundID]; 1409 result = word_4EE088_sound_ids[uSoundID];
1410 v5 = this; 1410 v5 = this;
1411 a2a = word_4EE088_sound_ids[uSoundID]; 1411 a2a = word_4EE088_sound_ids[uSoundID];
1412 if ( result ) 1412 if ( result )
3443 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) ) 3443 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) )
3444 { 3444 {
3445 v11 = &pParty->pHirelings[1]; 3445 v11 = &pParty->pHirelings[1];
3446 memset(v11, 0, sizeof(NPCData)); 3446 memset(v11, 0, sizeof(NPCData));
3447 } 3447 }
3448 pParty->field_709 = 0; 3448 pParty->hirelingScrollPosition = 0;
3449 pParty->CountHirelings(); 3449 pParty->CountHirelings();
3450 dword_591084 = 0; 3450 dword_591084 = 0;
3451 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 3451 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
3452 dword_7241C8 = 0; 3452 dword_7241C8 = 0;
3453 return; 3453 return;
3491 memcpy(pParty->pHirelings, speakingNPC, 0x4Cu); 3491 memcpy(pParty->pHirelings, speakingNPC, 0x4Cu);
3492 v15 = speakingNPC->pName; 3492 v15 = speakingNPC->pName;
3493 v13 = pParty->pHireling1Name; 3493 v13 = pParty->pHireling1Name;
3494 } 3494 }
3495 strcpy(v13, v15); 3495 strcpy(v13, v15);
3496 pParty->field_709 = 0; 3496 pParty->hirelingScrollPosition = 0;
3497 pParty->CountHirelings(); 3497 pParty->CountHirelings();
3498 3498
3499 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 3499 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
3500 3500
3501 if ( sDialogue_SpeakingActorNPC_ID >= 0 ) 3501 if ( sDialogue_SpeakingActorNPC_ID >= 0 )
3552 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) ) 3552 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) )
3553 { 3553 {
3554 v11 = &pParty->pHirelings[1]; 3554 v11 = &pParty->pHirelings[1];
3555 memset(v11, 0, sizeof(NPCData)); 3555 memset(v11, 0, sizeof(NPCData));
3556 } 3556 }
3557 pParty->field_709 = 0; 3557 pParty->hirelingScrollPosition = 0;
3558 pParty->CountHirelings(); 3558 pParty->CountHirelings();
3559 dword_591084 = 0; 3559 dword_591084 = 0;
3560 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 3560 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
3561 dword_7241C8 = 0; 3561 dword_7241C8 = 0;
3562 return; 3562 return;