Mercurial > mm7

diff mm7_2.cpp @ 1369:6b4a1c44a56f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Mon, 15 Jul 2013 08:20:28 +0400
parents 60cdc3eac407
children cc9a3a24d61d
line wrap: on
line diff
--- a/mm7_2.cpp	Mon Jul 15 08:18:35 2013 +0400
+++ b/mm7_2.cpp	Mon Jul 15 08:20:28 2013 +0400
@@ -825,13 +825,13 @@
   pWindow.uFrameZ = 543;
   pWindow.uFrameW = 397;
   pFont = LoadFont("endgame.fnt", "FONTPAL", NULL);
-  if ( (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 99) )
+  if ( pParty->IsPartyGood() )
   {
     v1 = pGlobalTXT_LocalizationStrings[675];
   }
   else
   {
-    result = _449B57_test_bit(pParty->_quest_bits, 100);
+    result = pParty->IsPartyEvil();
     if ( !(short)result )
       return result;
     v1 = pGlobalTXT_LocalizationStrings[676];