Mercurial > mm7

comparison Player.cpp @ 1358:61010a655c94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
a few itemID changed to their enum values + added a few new ones
author Grumpy7
date Sat, 13 Jul 2013 16:52:00 +0200
parents 06926081358f
children 60cdc3eac407
comparison
equal deleted inserted replaced
1357:06926081358f 1358:61010a655c94
680 //----- (00492C4E) -------------------------------------------------------- 680 //----- (00492C4E) --------------------------------------------------------
681 bool Player::CanEquip_RaceAndAlignmentCheck(unsigned int uItemID) 681 bool Player::CanEquip_RaceAndAlignmentCheck(unsigned int uItemID)
682 { 682 {
683 switch (uItemID) 683 switch (uItemID)
684 { 684 {
685 case 515: 685 case ITEM_RELIC_ETHRICS_STAFF:
686 case 517: 686 case ITEM_RELIC_OLD_NICK:
687 case 525: return _449B57_test_bit(pParty->_quest_bits, 100); break; 687 case ITEM_RELIC_TWILIGHT: return _449B57_test_bit(pParty->_quest_bits, 100); break;
688 case 521: 688 case ITEM_RELIC_TALEDONS_HELM:
689 case 527: return _449B57_test_bit(pParty->_quest_bits, 99); break; 689 case ITEM_RELIC_JUSTICE: return _449B57_test_bit(pParty->_quest_bits, 99); break;
690 case 531: return IsRaceGoblin(); break; 690 case ITEM_ARTIFACT_ELFBANE: return IsRaceGoblin(); break;
691 case 532: return IsRaceHuman(); break; 691 case ITEM_ARTIFACT_MINDS_EYE: return IsRaceHuman(); break;
692 case 533: return IsRaceElf(); break; 692 case ITEM_ELVEN_CHAINMAIL: return IsRaceElf(); break;
693 case 534: return IsRaceDwarf(); break; 693 case ITEM_FORGE_GAUNTLETS: return IsRaceDwarf(); break;
694 case 535: return IsMale(); break; 694 case ITEM_ARTIFACT_HEROS_BELT: return IsMale(); break;
695 case 536: return IsFemale(); break; 695 case ITEM_ARTIFACT_LADYS_ESCORT: return IsFemale(); break;
696 case 604: return NothingOrJustBlastersEquipped(); break; 696 case ITEM_WETSUIT: return NothingOrJustBlastersEquipped(); break;
697 default: return 1; break; 697 default: return 1; break;
698 } 698 }
699 } 699 }
700 //----- (00492D65) -------------------------------------------------------- 700 //----- (00492D65) --------------------------------------------------------
701 int Player::SetCondition(unsigned int uConditionIdx, int a3) 701 int Player::SetCondition(unsigned int uConditionIdx, int a3)
1574 int uSkillMult; // eax@3 1574 int uSkillMult; // eax@3
1575 int v5; // edi@7 1575 int v5; // edi@7
1576 signed int v6; // ebp@7 1576 signed int v6; // ebp@7
1577 char *v7; // esi@7 1577 char *v7; // esi@7
1578 signed int uSkillMultiplier; // [sp-4h] [bp-14h]@2 1578 signed int uSkillMultiplier; // [sp-4h] [bp-14h]@2
1579 1579
1580 if (CheckHiredNPCSpeciality(Scholar)) 1580 if (CheckHiredNPCSpeciality(Scholar))
1581 return true; 1581 return true;
1582 1582
1583 v2 = pPlayers[uActiveCharacter]->GetActualSkillLevel(PLAYER_SKILL_ITEM_ID); 1583 v2 = pPlayers[uActiveCharacter]->GetActualSkillLevel(PLAYER_SKILL_ITEM_ID);
1584 v3 = v2; 1584 v3 = v2;
7494 { 7494 {
7495 v9 = NULL; 7495 v9 = NULL;
7496 for (int i = 0; i < 138; i++) 7496 for (int i = 0; i < 138; i++)
7497 { 7497 {
7498 v9 = &this->pInventoryItems[i]; 7498 v9 = &this->pInventoryItems[i];
7499 if (v9->uItemID == 615) 7499 if (v9->uItemID == ITEM_LICH_JAR_EMPTY)
7500 break; 7500 break;
7501 } 7501 }
7502 if (v9 != NULL && v9->uItemID != 615) 7502 if (v9 != NULL && v9->uItemID != ITEM_LICH_JAR_EMPTY)
7503 { 7503 {
7504 v10 = (int)((char *)this + 36 * 138); //originally 36 * v8. the code got to this condition only if v8 was equal to 138 7504 v10 = (int)((char *)this + 36 * 138); //originally 36 * v8. the code got to this condition only if v8 was equal to 138
7505 *(int *)(v10 + 532) = 601; 7505 *(int *)(v10 + 532) = 601;
7506 *(char *)(v10 + 558) = currPlayerId + 1; 7506 *(char *)(v10 + 558) = currPlayerId + 1;
7507 } 7507 }