Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
1988:7e2dd49832b5 1989:33787c8938a5
436 a3.y = actor->vPosition.y - pParty->vPosition.y; 436 a3.y = actor->vPosition.y - pParty->vPosition.y;
437 a3.z = actor->vPosition.z - pParty->vPosition.z; 437 a3.z = actor->vPosition.z - pParty->vPosition.z;
438 Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z); 438 Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z);
439 439
440 DamageMonsterFromParty(PID(OBJECT_Player, uActiveCharacter - 1), target_id, &a3); 440 DamageMonsterFromParty(PID(OBJECT_Player, uActiveCharacter - 1), target_id, &a3);
441 if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_MAIN_HAND) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_OFF_HAND)) 441 if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_TWO_HANDED) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_SINGLE_HANDED))
442 _42FA66_do_explosive_impact( 442 _42FA66_do_explosive_impact(
443 actor->vPosition.x, 443 actor->vPosition.x,
444 actor->vPosition.y, 444 actor->vPosition.y,
445 actor->vPosition.z + actor->uActorHeight / 2, 445 actor->vPosition.z + actor->uActorHeight / 2,
446 0, 512, uActiveCharacter); 446 0, 512, uActiveCharacter);
476 if (shotting_laser) 476 if (shotting_laser)
477 v34 = 7; 477 v34 = 7;
478 else 478 else
479 { 479 {
480 int main_hand_idx = player->pEquipment.uMainHand; 480 int main_hand_idx = player->pEquipment.uMainHand;
481 if (player->HasItemEquipped(EQUIP_MAIN_HAND)) 481 if (player->HasItemEquipped(EQUIP_TWO_HANDED))
482 v34 = player->pInventoryItemList[main_hand_idx - 1].GetPlayerSkillType(); 482 v34 = player->pInventoryItemList[main_hand_idx - 1].GetPlayerSkillType();
483 pTurnEngine->ApplyPlayerAction(); 483 pTurnEngine->ApplyPlayerAction();
484 } 484 }
485 485
486 switch (v34) 486 switch (v34)