Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_5.cpp	Mon Feb 18 03:59:31 2013 +0200
+++ b/mm7_5.cpp	Mon Feb 18 07:11:43 2013 +0200
@@ -365,7 +365,7 @@
               auto npc = pNPCStats->pNewNPCData + i;
               //do
               //{
-                if (npc->uFlags & 0x80 &&
+                if (npc->Hired() &&
                     (!pParty->pHirelings[0].pName || strcmp(npc->pName, pParty->pHirelings[0].pName)) &&
                     (!pParty->pHirelings[1].pName || strcmp(npc->pName, pParty->pHirelings[1].pName)) )
                 {
@@ -398,8 +398,8 @@
         case UIMSG_195:
           sub_4BCACC_bounties(uMessageParam);
           continue;
-        case UIMSG_88:
-          sub_4BC49B(uMessageParam);
+        case UIMSG_SelectDialogueOption:
+          OnSelectDialogueOption((DIALOGUE_TYPE)uMessageParam);
           continue;
         case UIMSG_19A:
           _4B4224_UpdateNPCTopics(uMessageParam);
@@ -16044,7 +16044,7 @@
       while ( (signed int)lpsz < (signed int)pNPCStats->uNumNewNPCs );*/
       for (int i = 0; i < pNPCStats->uNumNewNPCs; ++i)
       {
-        if (pNPCStats->pNewNPCData[i].uFlags & 0x80)
+        if (pNPCStats->pNewNPCData[i].Hired())
         {
           if (!pParty->pHirelings[0].pName || strcmp((char *)pNPCStats->pNewNPCData[i].pName, (char *)pParty->pHirelings[0].pName))
           {