Mercurial > mm7

comparison mm7_5.cpp @ 248:37dcbe8f3cca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dialogue stuff
author Nomad
date Mon, 18 Feb 2013 07:11:43 +0200
parents fb8a876f41e1
children d1af3319bc44 2d6dda2e0405
comparison
equal deleted inserted replaced
247:fb8a876f41e1 248:37dcbe8f3cca
363 for (uint i = 0; i < pNPCStats->uNumNewNPCs; ++i) 363 for (uint i = 0; i < pNPCStats->uNumNewNPCs; ++i)
364 { 364 {
365 auto npc = pNPCStats->pNewNPCData + i; 365 auto npc = pNPCStats->pNewNPCData + i;
366 //do 366 //do
367 //{ 367 //{
368 if (npc->uFlags & 0x80 && 368 if (npc->Hired() &&
369 (!pParty->pHirelings[0].pName || strcmp(npc->pName, pParty->pHirelings[0].pName)) && 369 (!pParty->pHirelings[0].pName || strcmp(npc->pName, pParty->pHirelings[0].pName)) &&
370 (!pParty->pHirelings[1].pName || strcmp(npc->pName, pParty->pHirelings[1].pName)) ) 370 (!pParty->pHirelings[1].pName || strcmp(npc->pName, pParty->pHirelings[1].pName)) )
371 { 371 {
372 //v7 =; 372 //v7 =;
373 pTmpBuf[uAction++] = i + 2; 373 pTmpBuf[uAction++] = i + 2;
396 sub_4B2001(uMessageParam); 396 sub_4B2001(uMessageParam);
397 continue; 397 continue;
398 case UIMSG_195: 398 case UIMSG_195:
399 sub_4BCACC_bounties(uMessageParam); 399 sub_4BCACC_bounties(uMessageParam);
400 continue; 400 continue;
401 case UIMSG_88: 401 case UIMSG_SelectDialogueOption:
402 sub_4BC49B(uMessageParam); 402 OnSelectDialogueOption((DIALOGUE_TYPE)uMessageParam);
403 continue; 403 continue;
404 case UIMSG_19A: 404 case UIMSG_19A:
405 _4B4224_UpdateNPCTopics(uMessageParam); 405 _4B4224_UpdateNPCTopics(uMessageParam);
406 continue; 406 continue;
407 case UIMSG_StartNewGame: 407 case UIMSG_StartNewGame:
16042 ++v4; 16042 ++v4;
16043 } 16043 }
16044 while ( (signed int)lpsz < (signed int)pNPCStats->uNumNewNPCs );*/ 16044 while ( (signed int)lpsz < (signed int)pNPCStats->uNumNewNPCs );*/
16045 for (int i = 0; i < pNPCStats->uNumNewNPCs; ++i) 16045 for (int i = 0; i < pNPCStats->uNumNewNPCs; ++i)
16046 { 16046 {
16047 if (pNPCStats->pNewNPCData[i].uFlags & 0x80) 16047 if (pNPCStats->pNewNPCData[i].Hired())
16048 { 16048 {
16049 if (!pParty->pHirelings[0].pName || strcmp((char *)pNPCStats->pNewNPCData[i].pName, (char *)pParty->pHirelings[0].pName)) 16049 if (!pParty->pHirelings[0].pName || strcmp((char *)pNPCStats->pNewNPCData[i].pName, (char *)pParty->pHirelings[0].pName))
16050 { 16050 {
16051 if (!pParty->pHirelings[1].pName || strcmp((char *)pNPCStats->pNewNPCData[i].pName, (char *)pParty->pHirelings[1].pName)) 16051 if (!pParty->pHirelings[1].pName || strcmp((char *)pNPCStats->pNewNPCData[i].pName, (char *)pParty->pHirelings[1].pName))
16052 pTmpBuf[v1++] = i + 2; 16052 pTmpBuf[v1++] = i + 2;