Mercurial > mm7

comparison UI/UiGame.cpp @ 1653:d453ed393d6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NPCGreetings
author Ritor1
date Wed, 18 Sep 2013 11:04:47 +0600
parents 07fe868f0b44
children a7eebb6ee7a2 e1d1fe32c194
comparison
equal deleted inserted replaced
1652:42055a4bd550 1653:d453ed393d6e
432 else if (pGreetType == 1)//QuestNPC_greet 432 else if (pGreetType == 1)//QuestNPC_greet
433 { 433 {
434 if (pNPC->greet) 434 if (pNPC->greet)
435 { 435 {
436 if ((pNPC->uFlags & 3) == 2) 436 if ((pNPC->uFlags & 3) == 2)
437 pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting2; 437 pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting[1];
438 else 438 else
439 pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting1; 439 pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting[0];
440 } 440 }
441 } 441 }
442 else if (pGreetType == 2)//HiredNPC_greet 442 else if (pGreetType == 2)//HiredNPC_greet
443 { 443 {
444 auto prof = pNPCStats->pProfessions + pNPC->uProfession; 444 auto prof = pNPCStats->pProfessions + pNPC->uProfession;