Mercurial > mm7

diff mm7_4.cpp @ 147:c70fea5013aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
12.02.13
author Ritor1
date Tue, 12 Feb 2013 09:11:03 +0600
parents 909822c91d47
children 77ad59c17864
line wrap: on
line diff
--- a/mm7_4.cpp	Mon Feb 11 09:08:00 2013 +0600
+++ b/mm7_4.cpp	Tue Feb 12 09:11:03 2013 +0600
@@ -3097,7 +3097,7 @@
 
     for (uint i = 0; i < pNPCStats->uNumNewNPCs; ++i)
     {
-      if (pNPCStats->pNewNPCData[i].uFlags & 0x80)
+      if (pNPCStats->pNewNPCData[i].uFlags == 128)
       {
         if (!pParty->pHirelings[0].pName || strcmp(pNPCStats->pNewNPCData[i].pName, pParty->pHirelings[0].pName))
         {
@@ -9704,7 +9704,8 @@
     }
     Party::TakeGold(v21);
   }
-  LOBYTE(v2->uFlags) |= 0x80u;
+  //LOBYTE(v2->uFlags) |= 0x80u;
+  v2->uFlags = 128;
   pParty->field_709 = 0;
   sub_44A56A();
   if ( pParty->pHirelings[0].pName )