Mercurial > mm7

comparison UI/UiGame.cpp @ 1655:a7eebb6ee7a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Window Resize (change arguments to MM7_Initialize)
author Nomad
date Wed, 18 Sep 2013 11:13:38 +0200
parents d453ed393d6e
children 620b6ba3e6b8
comparison
equal deleted inserted replaced
1654:d11b5669f089 1655:a7eebb6ee7a2
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].pGreeting[1]; 437 pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting2;
438 else 438 else
439 pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting[0]; 439 pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting1;
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;