Mercurial > mm7

changeset 253:f1218b9d67f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Gloval
date Mon, 18 Feb 2013 09:03:15 +0400
parents e22e2357c8b3
children 96f3a1177b37
files NPC.cpp NPC.h mm7_3.cpp
diffstat 3 files changed, 7 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/NPC.cpp	Mon Feb 18 08:59:34 2013 +0400
+++ b/NPC.cpp	Mon Feb 18 09:03:15 2013 +0400
@@ -795,11 +795,11 @@
 	}
 
 
-//----- (00476387) --------------------------------------------------------
-bool __cdecl sub_476387()
-	{
-	return (pNPCStats->pNewNPCData[57].uFlags & 0x80) != 0;
-	}
+	//----- (00476387) --------------------------------------------------------
+	bool PartyHasDragon()
+		{
+		return pNPCStats->pNewNPCData[57].Hired();
+		}
 
 //----- (00476395) --------------------------------------------------------
 //0x26 Wizard eye at skill level 2
--- a/NPC.h	Mon Feb 18 08:59:34 2013 +0400
+++ b/NPC.h	Mon Feb 18 09:03:15 2013 +0400
@@ -128,5 +128,5 @@
 };
 #pragma pack(pop)
 
-bool __cdecl sub_476387();
+bool PartyHasDragon();
 bool CheckHiredNPCSpeciality(unsigned int uProfession);
--- a/mm7_3.cpp	Mon Feb 18 08:59:34 2013 +0400
+++ b/mm7_3.cpp	Mon Feb 18 09:03:15 2013 +0400
@@ -4703,11 +4703,7 @@
   return result;
 }
 
-//----- (00476387) --------------------------------------------------------
-bool PartyHasDragon()
-{
-  return pNPCStats->pNewNPCData[57].Hired();
-}
+
 
 
 // 47730C: using guessed type int __stdcall const_1(int);