Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_6.cpp	Sat May 25 18:46:48 2013 +0100
+++ b/mm7_6.cpp	Sat May 25 23:50:56 2013 +0400
@@ -2829,7 +2829,7 @@
 			pSpellSprite.spell_id = pCastSpell->spellnum;
 			pSpellSprite.spell_skill = v731;
 			pSpellSprite.uObjectDescID = pObjectList->ObjectIDByItemID(pSpellSprite.uType);
-			if ( pPlayer->WearsItem(510, 2) )
+			if ( pPlayer->WearsItem(ITEM_ARTEFACT_ULLYSES, EQUIP_BOW) )
 				pSpellSprite.uObjectDescID = pObjectList->ObjectIDByItemID(0xBD6u);
 			pSpellSprite.vPosition.x = pParty->vPosition.x;
 			pSpellSprite.vPosition.y = pParty->vPosition.y;
@@ -6750,7 +6750,7 @@
     Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z);
 
     DamageMonsterFromParty(PID(OBJECT_Player, uActiveCharacter - 1), target_id, &a3);
-    if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, 1) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, 0))
+    if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_MAIN_HAND) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_OFF_HAND))
           _42FA66_do_explosive_impact(
             actor->vPosition.x,
             actor->vPosition.y,