Mercurial > mm7

diff mm7_6.cpp @ 1989:33787c8938a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Single and Two-handed ENUM
author zipi
date Sat, 02 Nov 2013 17:45:58 +0000
parents c1c74df0a33e
children 7a9477135943
line wrap: on
line diff
--- a/mm7_6.cpp	Sat Nov 02 17:24:31 2013 +0000
+++ b/mm7_6.cpp	Sat Nov 02 17:45:58 2013 +0000
@@ -438,7 +438,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, EQUIP_MAIN_HAND) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_OFF_HAND))
+    if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_TWO_HANDED) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_SINGLE_HANDED))
           _42FA66_do_explosive_impact(
             actor->vPosition.x,
             actor->vPosition.y,
@@ -478,7 +478,7 @@
   else
   {
     int main_hand_idx = player->pEquipment.uMainHand;
-    if (player->HasItemEquipped(EQUIP_MAIN_HAND))
+    if (player->HasItemEquipped(EQUIP_TWO_HANDED))
       v34 = player->pInventoryItemList[main_hand_idx - 1].GetPlayerSkillType();
     pTurnEngine->ApplyPlayerAction();
   }