Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
1089:24372d97a7bf 1090:8b59f13c9c3e
3039 pSpellSprite.spell_caster_pid = PID(OBJECT_Player, pCastSpell->uPlayerID); 3039 pSpellSprite.spell_caster_pid = PID(OBJECT_Player, pCastSpell->uPlayerID);
3040 pSpellSprite.uSoundID = LOWORD(pCastSpell->sound_id); 3040 pSpellSprite.uSoundID = LOWORD(pCastSpell->sound_id);
3041 pSpellSprite.vPosition.x = pActors[PID_ID(a2)].vPosition.x; 3041 pSpellSprite.vPosition.x = pActors[PID_ID(a2)].vPosition.x;
3042 pSpellSprite.vPosition.y = pActors[PID_ID(a2)].vPosition.y; 3042 pSpellSprite.vPosition.y = pActors[PID_ID(a2)].vPosition.y;
3043 pSpellSprite.vPosition.z = pActors[PID_ID(a2)].vPosition.z; 3043 pSpellSprite.vPosition.z = pActors[PID_ID(a2)].vPosition.z;
3044 pSpellSprite.spell_target_pid = PID(OBJECT_Actor, (int)v726); 3044 pSpellSprite.spell_target_pid = PID(OBJECT_Actor, PID_ID(a2));
3045 auto obj_id = pSpellSprite.Create(0, 0, 0, 0); 3045 auto obj_id = pSpellSprite.Create(0, 0, 0, 0);
3046 DamageMonsterFromParty(PID(OBJECT_Item, obj_id), PID_ID(a2), &v704); 3046 DamageMonsterFromParty(PID(OBJECT_Item, obj_id), PID_ID(a2), &v704);
3047 LODWORD(v727) = 1; 3047 LODWORD(v727) = 1;
3048 break; 3048 break;
3049 } 3049 }
3488 { 3488 {
3489 v92 = pParty->pPlayers;//[0].pConditions[1]; 3489 v92 = pParty->pPlayers;//[0].pConditions[1];
3490 LODWORD(v727) = 1; 3490 LODWORD(v727) = 1;
3491 do 3491 do
3492 { 3492 {
3493 if ( v92->pConditions ) 3493 if ( v92->pConditions[1] )
3494 LODWORD(v727) = 0; 3494 LODWORD(v727) = 0;
3495 ++v92; 3495 ++v92;
3496 } 3496 }
3497 while ( v92 <= &pParty->pPlayers[3] ); 3497 while ( v92 <= &pParty->pPlayers[3] );
3498 if (LODWORD(v727)) 3498 if (LODWORD(v727))
3755 pSpellSprite.uObjectDescID = pObjectList->ObjectIDByItemID(pSpellSprite.uType); 3755 pSpellSprite.uObjectDescID = pObjectList->ObjectIDByItemID(pSpellSprite.uType);
3756 pSpellSprite.uAttributes = 0; 3756 pSpellSprite.uAttributes = 0;
3757 pSpellSprite.vPosition.x = uRequiredMana; 3757 pSpellSprite.vPosition.x = uRequiredMana;
3758 pSpellSprite.vPosition.y = LODWORD(v727); 3758 pSpellSprite.vPosition.y = LODWORD(v727);
3759 pSpellSprite.uSectorID = 0; 3759 pSpellSprite.uSectorID = 0;
3760 pSpellSprite.vPosition.z = a2 + v713; 3760 pSpellSprite.vPosition.z = a2 + v154;
3761 pSpellSprite.uSpriteFrameID = 0; 3761 pSpellSprite.uSpriteFrameID = 0;
3762 pSpellSprite.spell_caster_pid = PID(OBJECT_Player, pCastSpell->uPlayerID); 3762 pSpellSprite.spell_caster_pid = PID(OBJECT_Player, pCastSpell->uPlayerID);
3763 pSpellSprite.spell_target_pid = v730; 3763 pSpellSprite.spell_target_pid = v730;
3764 pSpellSprite.field_60_distance_related_prolly_lod = stru_50C198._427546(a2 + 2500); 3764 pSpellSprite.field_60_distance_related_prolly_lod = stru_50C198._427546(a2 + 2500);
3765 pSpellSprite.uFacing = v687; 3765 pSpellSprite.uFacing = v687;