Mercurial > mm7

diff mm7_3.cpp @ 484:4bd56919f075

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avard quest guild bits
author Gloval
date Wed, 27 Feb 2013 02:25:31 +0400
parents 0dbf780e247f
children b6bdfaa3ae0f
line wrap: on
line diff
--- a/mm7_3.cpp	Tue Feb 26 17:24:53 2013 +0600
+++ b/mm7_3.cpp	Wed Feb 27 02:25:31 2013 +0400
@@ -3173,7 +3173,8 @@
     bWaterWalk = 1;
     *(short *)&stru_5E4C90._decor_events[20 * pParty->pPartyBuffs[18].uOverlayID + 119] |= 1u;
     if (!(pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uFlags & 1) &&
-		pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uCaster-1].sMana <= 0 )//*(int *)&pParty->pArtifactsFound[6972 * pParty->pPartyBuffs[18].uCaster + 10] <= 0 )
+		pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uCaster-1].sMana <= 0 )
+		//*(int *)&pParty->pArtifactsFound[6972 * pParty->pPartyBuffs[18].uCaster + 10] <= 0 )
       bWaterWalk = 0;
   }
   v3 = sub_46D49E_prolly_get_world_y_under_party(v116, v117, v123, pParty->uPartyHeight, &v130, &v108, bWaterWalk);
@@ -7596,26 +7597,26 @@
 
   v1 = 0;
   v2 = this;
-  if ( pParty->uCurrentHour >= 1 || (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 178) )
+  if ( pParty->uCurrentHour >= 1 || (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 178) )
   {
     v1 = 0;
   }
   else
   {
-    if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 164)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 165)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 166)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 167)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 168)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 169)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 170)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 171)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 172)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 173)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 174)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 175)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 176)
-      && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 177) )
+    if ( (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 164)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 165)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 166)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 167)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 168)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 169)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 170)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 171)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 172)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 173)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 174)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 175)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 176)
+      && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 177) )
     {
       v1 = 1;
       LOBYTE(v2->field_2) &= 0xDFu;