Mercurial > mm7

comparison mm7_3.cpp @ 825:35c31a49d989

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Tue, 26 Mar 2013 23:18:58 +0600
parents 7bb33867d2cb
children 1133e34a7560
comparison
equal deleted inserted replaced
809:7bb33867d2cb 825:35c31a49d989
12650 default: 12650 default:
12651 if (uDialogueType > DIALOGUE_18 && uDialogueType < DIALOGUE_23 && !byte_5B0938[0]) 12651 if (uDialogueType > DIALOGUE_18 && uDialogueType < DIALOGUE_23 && !byte_5B0938[0])
12652 { 12652 {
12653 pInString = (char *)ptr_F8B1E8; 12653 pInString = (char *)ptr_F8B1E8;
12654 } 12654 }
12655 else if (v1 == 1) 12655 else if (v1 == 1)//QuestNPCDialogue
12656 { 12656 {
12657 if (pNPC->greet) 12657 if (pNPC->greet)
12658 { 12658 {
12659 if ((pNPC->uFlags & 3) == 2) 12659 if ((pNPC->uFlags & 3) == 2)
12660 pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting2; 12660 pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting2;
12661 else 12661 else
12662 pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting1; 12662 pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting1;
12663 } 12663 }
12664 } 12664 }
12665 else if (v1 == 2) 12665 else if (v1 == 2)//HiredNPCDialogue
12666 { 12666 {
12667 auto prof = pNPCStats->pProfessions + pNPC->uProfession - 1; 12667 auto prof = pNPCStats->pProfessions + pNPC->uProfession - 1;
12668 12668
12669 if (pNPC->Hired()) 12669 if (pNPC->Hired())
12670 pInString = BuilDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0); 12670 pInString = BuilDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0);