Mercurial > mm7

comparison mm7_4.cpp @ 1793:4dee76d79c78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
author Grumpy7
date Sun, 06 Oct 2013 09:19:12 +0200
parents 421c29d4ab3e
children 4002c0fe5efc
comparison
equal deleted inserted replaced
1792:3155be890554 1793:4dee76d79c78
1403 int *v6; // edi@2 1403 int *v6; // edi@2
1404 unsigned int v7; // eax@3 1404 unsigned int v7; // eax@3
1405 int v8; // [sp+Ch] [bp-8h]@3 1405 int v8; // [sp+Ch] [bp-8h]@3
1406 int v9; // [sp+10h] [bp-4h]@2 1406 int v9; // [sp+10h] [bp-4h]@2
1407 int a2a; // [sp+1Ch] [bp+8h]@1 1407 int a2a; // [sp+1Ch] [bp+8h]@1
1408 1408 return 0;
1409 v3 = 0; 1409 v3 = 0;
1410 result = word_4EE088_sound_ids[uSoundID]; 1410 result = word_4EE088_sound_ids[uSoundID];
1411 v5 = this; 1411 v5 = this;
1412 a2a = word_4EE088_sound_ids[uSoundID]; 1412 a2a = word_4EE088_sound_ids[uSoundID];
1413 if ( result ) 1413 if ( result )
3444 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) ) 3444 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) )
3445 { 3445 {
3446 v11 = &pParty->pHirelings[1]; 3446 v11 = &pParty->pHirelings[1];
3447 memset(v11, 0, sizeof(NPCData)); 3447 memset(v11, 0, sizeof(NPCData));
3448 } 3448 }
3449 pParty->field_709 = 0; 3449 pParty->hirelingScrollPosition = 0;
3450 pParty->CountHirelings(); 3450 pParty->CountHirelings();
3451 dword_591084 = 0; 3451 dword_591084 = 0;
3452 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 3452 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
3453 dword_7241C8 = 0; 3453 dword_7241C8 = 0;
3454 return; 3454 return;
3492 memcpy(pParty->pHirelings, speakingNPC, 0x4Cu); 3492 memcpy(pParty->pHirelings, speakingNPC, 0x4Cu);
3493 v15 = speakingNPC->pName; 3493 v15 = speakingNPC->pName;
3494 v13 = pParty->pHireling1Name; 3494 v13 = pParty->pHireling1Name;
3495 } 3495 }
3496 strcpy(v13, v15); 3496 strcpy(v13, v15);
3497 pParty->field_709 = 0; 3497 pParty->hirelingScrollPosition = 0;
3498 pParty->CountHirelings(); 3498 pParty->CountHirelings();
3499 3499
3500 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 3500 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
3501 3501
3502 if ( sDialogue_SpeakingActorNPC_ID >= 0 ) 3502 if ( sDialogue_SpeakingActorNPC_ID >= 0 )
3553 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) ) 3553 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) )
3554 { 3554 {
3555 v11 = &pParty->pHirelings[1]; 3555 v11 = &pParty->pHirelings[1];
3556 memset(v11, 0, sizeof(NPCData)); 3556 memset(v11, 0, sizeof(NPCData));
3557 } 3557 }
3558 pParty->field_709 = 0; 3558 pParty->hirelingScrollPosition = 0;
3559 pParty->CountHirelings(); 3559 pParty->CountHirelings();
3560 dword_591084 = 0; 3560 dword_591084 = 0;
3561 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 3561 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
3562 dword_7241C8 = 0; 3562 dword_7241C8 = 0;
3563 return; 3563 return;