Mercurial > mm7

comparison mm7_6.cpp @ 1080:9456f2ed5ff9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
getskillbonus continue cleaning
author Gloval
date Sat, 25 May 2013 23:50:56 +0400
parents d48c762de563
children 8439c5df37cc
comparison
equal deleted inserted replaced
1077:2210109f280d 1080:9456f2ed5ff9
2827 pSpellSprite.stru_24.Reset(); 2827 pSpellSprite.stru_24.Reset();
2828 pSpellSprite.spell_level = v2; 2828 pSpellSprite.spell_level = v2;
2829 pSpellSprite.spell_id = pCastSpell->spellnum; 2829 pSpellSprite.spell_id = pCastSpell->spellnum;
2830 pSpellSprite.spell_skill = v731; 2830 pSpellSprite.spell_skill = v731;
2831 pSpellSprite.uObjectDescID = pObjectList->ObjectIDByItemID(pSpellSprite.uType); 2831 pSpellSprite.uObjectDescID = pObjectList->ObjectIDByItemID(pSpellSprite.uType);
2832 if ( pPlayer->WearsItem(510, 2) ) 2832 if ( pPlayer->WearsItem(ITEM_ARTEFACT_ULLYSES, EQUIP_BOW) )
2833 pSpellSprite.uObjectDescID = pObjectList->ObjectIDByItemID(0xBD6u); 2833 pSpellSprite.uObjectDescID = pObjectList->ObjectIDByItemID(0xBD6u);
2834 pSpellSprite.vPosition.x = pParty->vPosition.x; 2834 pSpellSprite.vPosition.x = pParty->vPosition.x;
2835 pSpellSprite.vPosition.y = pParty->vPosition.y; 2835 pSpellSprite.vPosition.y = pParty->vPosition.y;
2836 pSpellSprite.uAttributes = 0; 2836 pSpellSprite.uAttributes = 0;
2837 pSpellSprite.uSpriteFrameID = 0; 2837 pSpellSprite.uSpriteFrameID = 0;
6748 a3.y = actor->vPosition.y - pParty->vPosition.y; 6748 a3.y = actor->vPosition.y - pParty->vPosition.y;
6749 a3.z = actor->vPosition.z - pParty->vPosition.z; 6749 a3.z = actor->vPosition.z - pParty->vPosition.z;
6750 Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z); 6750 Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z);
6751 6751
6752 DamageMonsterFromParty(PID(OBJECT_Player, uActiveCharacter - 1), target_id, &a3); 6752 DamageMonsterFromParty(PID(OBJECT_Player, uActiveCharacter - 1), target_id, &a3);
6753 if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, 1) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, 0)) 6753 if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_MAIN_HAND) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_OFF_HAND))
6754 _42FA66_do_explosive_impact( 6754 _42FA66_do_explosive_impact(
6755 actor->vPosition.x, 6755 actor->vPosition.x,
6756 actor->vPosition.y, 6756 actor->vPosition.y,
6757 actor->vPosition.z + actor->uActorHeight / 2, 6757 actor->vPosition.z + actor->uActorHeight / 2,
6758 0, 512, uActiveCharacter); 6758 0, 512, uActiveCharacter);