# HG changeset patch # User zipi # Date 1369532698 -3600 # Node ID 8b59f13c9c3e09bcdf6a954a861d1e9ca56bd219 # Parent 24372d97a7bf2e69c44f1560c0b02c822c16cd60 a few spells fixed diff -r 24372d97a7bf -r 8b59f13c9c3e mm7_3.cpp --- a/mm7_3.cpp Sun May 26 01:41:36 2013 +0100 +++ b/mm7_3.cpp Sun May 26 02:44:58 2013 +0100 @@ -4286,7 +4286,8 @@ v33 = (double)v16 * 0.0000152587890625; //UNDEF(v17); v20 = *((float *)v15 - 1) - (double)pIndoorCamera->pos.x; - if ( v19 | v18 ) + //if ( v19 | v18 ) + if(pIndoorCamera->pos.x == 0) { v27 = v20; LODWORD(v35) = *((int *)v15 + 1); diff -r 24372d97a7bf -r 8b59f13c9c3e mm7_6.cpp --- 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;