Mercurial > mm7

diff mm7_6.cpp @ 1163:3d96daa7e069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Tue, 04 Jun 2013 01:41:12 +0200
parents 502b8b2e36b4
children 29a8defbad9e
line wrap: on
line diff
--- a/mm7_6.cpp	Tue Jun 04 01:40:53 2013 +0200
+++ b/mm7_6.cpp	Tue Jun 04 01:41:12 2013 +0200
@@ -2599,7 +2599,7 @@
   AwardType *v607; // ecx@1100
   __int16 v608; // ax@1102
   signed int v609; // eax@1104
-  //int v610; // edi@1106
+  int v610; // edi@1106
   unsigned int v611; // eax@1106
   Player *v612; // edi@1106
   DDM_DLV_Header *v613; // eax@1108
@@ -6207,8 +6207,7 @@
 			}
 			v608 = pCastSpell->uPlayerID_2;
 			if ( v608 != 4 && v608 != 5
-				//|| (v609 = (signed int)*(&pFontCChar + v608 + (unsigned __int8)pParty->field_709), v609 <= 0)
-				|| (v609 = achieved_awards[v608 + (unsigned __int8)pParty->field_709 - 4], v609 <= 0)
+				|| (v609 = (signed int)*(&pFontCChar + v608 + (unsigned __int8)pParty->field_709), v609 <= 0)
 				|| v609 >= 3 )
 			{
 				ShowStatusBarString(pGlobalTXT_LocalizationStrings[428], 2); // Spell failed
@@ -6216,7 +6215,7 @@
 				pCastSpell->spellnum = 0;
 				continue;
 			}
-			//v610 = 76 * v609;
+			v610 = 76 * v609;
 			//*((int *)&pParty->pPlayers[3].pInstalledBeacons[4].uBeaconTime + 19 * v609) = 0;
 			pParty->pHirelings[v609-1].evt_B = 0;
 			v611 = pIconsFrameTable->FindIcon("spell96");