Mercurial > mm7

diff mm7_6.cpp @ 951:840b78f6c2d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 01 May 2013 23:36:54 +0600
parents 5e87b0c3f939 c0d0656aa662
children 9c2d08e42ed3
line wrap: on
line diff
--- a/mm7_6.cpp	Wed May 01 23:36:40 2013 +0600
+++ b/mm7_6.cpp	Wed May 01 23:36:54 2013 +0600
@@ -7291,7 +7291,7 @@
 		if ( !pPlayer->CanCastSpell(uRequiredMana) )
 			break;
 		HIDWORD(v733) = 0;
-		memset(&achievedAwardsIndex, 0, 4000);
+		memset(&achieved_awards, 0, 4000);
 		_this = 0;
 		v605 = (char *)pParty->pHirelings;
 		do
@@ -7299,7 +7299,7 @@
 			if ( *(int *)v605)
 			{
 			v606 = HIDWORD(v733)++;
-			achievedAwardsIndex[v606] = (int)((char *)&_this->uItemID + 1);
+			achieved_awards[v606] = (AwardType)(int)((char *)&_this->uItemID + 1);
 			}
 			_this = (ItemGen *)((char *)_this + 1);
 			v605 += 76;
@@ -7309,6 +7309,7 @@
 		if ( (signed int)pNPCStats->uNumNewNPCs > 0)
 		{
 			v730 = (int)pNPCStats->pNewNPCData;
+            __debugbreak(); // data offset
 			HIDWORD(v733) = 4 * HIDWORD(v733) + 6043152;
 			do
 			{