Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
1368:cc2a25ce8ed2 1369:6b4a1c44a56f
823 pWindow.uFrameWidth = 469; 823 pWindow.uFrameWidth = 469;
824 pWindow.uFrameHeight = 338; 824 pWindow.uFrameHeight = 338;
825 pWindow.uFrameZ = 543; 825 pWindow.uFrameZ = 543;
826 pWindow.uFrameW = 397; 826 pWindow.uFrameW = 397;
827 pFont = LoadFont("endgame.fnt", "FONTPAL", NULL); 827 pFont = LoadFont("endgame.fnt", "FONTPAL", NULL);
828 if ( (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 99) ) 828 if ( pParty->IsPartyGood() )
829 { 829 {
830 v1 = pGlobalTXT_LocalizationStrings[675]; 830 v1 = pGlobalTXT_LocalizationStrings[675];
831 } 831 }
832 else 832 else
833 { 833 {
834 result = _449B57_test_bit(pParty->_quest_bits, 100); 834 result = pParty->IsPartyEvil();
835 if ( !(short)result ) 835 if ( !(short)result )
836 return result; 836 return result;
837 v1 = pGlobalTXT_LocalizationStrings[676]; 837 v1 = pGlobalTXT_LocalizationStrings[676];
838 } 838 }
839 pInString = v1; 839 pInString = v1;