Mercurial > mm7

diff mm7_6.cpp @ 1090:8b59f13c9c3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
a few spells fixed
author zipi
date Sun, 26 May 2013 02:44:58 +0100
parents 8439c5df37cc
children b82375804b5d
line wrap: on
line diff
--- a/mm7_6.cpp	Sun May 26 01:41:36 2013 +0100
+++ b/mm7_6.cpp	Sun May 26 02:44:58 2013 +0100
@@ -3041,7 +3041,7 @@
 			pSpellSprite.vPosition.x = pActors[PID_ID(a2)].vPosition.x;
 			pSpellSprite.vPosition.y = pActors[PID_ID(a2)].vPosition.y;
 			pSpellSprite.vPosition.z = pActors[PID_ID(a2)].vPosition.z;
-			pSpellSprite.spell_target_pid = PID(OBJECT_Actor, (int)v726);
+			pSpellSprite.spell_target_pid = PID(OBJECT_Actor, PID_ID(a2));
 			auto obj_id = pSpellSprite.Create(0, 0, 0, 0);
 			DamageMonsterFromParty(PID(OBJECT_Item, obj_id), PID_ID(a2), &v704);
 			LODWORD(v727) = 1;
@@ -3490,7 +3490,7 @@
 				LODWORD(v727) = 1;
 				do
 				{
-					if ( v92->pConditions )
+					if ( v92->pConditions[1] )
 						LODWORD(v727) = 0;
 					++v92;
 				}
@@ -3757,7 +3757,7 @@
 					pSpellSprite.vPosition.x = uRequiredMana;
 					pSpellSprite.vPosition.y = LODWORD(v727);
 					pSpellSprite.uSectorID = 0;
-					pSpellSprite.vPosition.z = a2 + v713;
+					pSpellSprite.vPosition.z = a2 + v154;
 					pSpellSprite.uSpriteFrameID = 0;
 					pSpellSprite.spell_caster_pid = PID(OBJECT_Player, pCastSpell->uPlayerID);
 					pSpellSprite.spell_target_pid = v730;