Mercurial > mm7

comparison Player.cpp @ 1684:f84b8b2a875c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing a few warnings in Players.cpp
author Grumpy7
date Fri, 20 Sep 2013 10:51:42 +0200
parents 96d567a7d15f
children 2a309997c42f
comparison
equal deleted inserted replaced
1683:96d567a7d15f 1684:f84b8b2a875c
128 {100, 75, 40, 10}, //Endurance 128 {100, 75, 40, 10}, //Endurance
129 {100, 100, 40, 10}, //Accuracy 129 {100, 100, 40, 10}, //Accuracy
130 {100, 100, 40, 10}, //Speed 130 {100, 100, 40, 10}, //Speed
131 {100, 100, 100, 100}}; //Luck 131 {100, 100, 100, 100}}; //Luck
132 132
133 signed int pAgeingTable[4] = {50, 100, 150, 0xFFFF}; 133 unsigned int pAgeingTable[4] = {50, 100, 150, 0xFFFF};
134 134
135 std::array<unsigned int, 18> pConditionImportancyTable = {{16, 15, 14, 17, 13, 2, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 1, 0}}; 135 std::array<unsigned int, 18> pConditionImportancyTable = {{16, 15, 14, 17, 13, 2, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 1, 0}};
136 136
137 short param_to_bonus_table[29] = {500, 400, 350, 300, 275, 250, 225, 200, 175, 137 short param_to_bonus_table[29] = {500, 400, 350, 300, 275, 250, 225, 200, 175,
138 150, 125, 100, 75, 50, 40, 35, 30, 25, 21, 138 150, 125, 100, 75, 50, 40, 35, 30, 25, 21,
1531 + itemBonus 1531 + itemBonus
1532 + this->*attrBonus; 1532 + this->*attrBonus;
1533 } 1533 }
1534 1534
1535 //----- (0048CCF5) -------------------------------------------------------- 1535 //----- (0048CCF5) --------------------------------------------------------
1536 int Player::GetActualAttack(int a2) 1536 int Player::GetActualAttack( bool a2 )
1537 { 1537 {
1538 int v3; // eax@1 1538 int v3; // eax@1
1539 int v4; // edi@1 1539 int v4; // edi@1
1540 int v5; // ebx@1 1540 int v5; // ebx@1
1541 int v6; // ebp@1 1541 int v6; // ebp@1
1702 v7 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v6; 1702 v7 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v6;
1703 v3 = this->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7; 1703 v3 = this->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7;
1704 } 1704 }
1705 else 1705 else
1706 { 1706 {
1707 v3 = GetActualAttack(1); 1707 v3 = GetActualAttack(true);
1708 } 1708 }
1709 return v3; 1709 return v3;
1710 } 1710 }
1711 1711
1712 //----- (0048D124) -------------------------------------------------------- 1712 //----- (0048D124) --------------------------------------------------------
4417 } 4417 }
4418 4418
4419 //----- (004908A8) -------------------------------------------------------- 4419 //----- (004908A8) --------------------------------------------------------
4420 bool Player::DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime) 4420 bool Player::DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime)
4421 { 4421 {
4422 if ( pConditions[uCondition] && (uTime < pConditions[uCondition]) ) 4422 if ( pConditions[uCondition] && (uTime < (signed long long)pConditions[uCondition]) )
4423 { 4423 {
4424 pConditions[uCondition] = 0i64; 4424 pConditions[uCondition] = 0i64;
4425 return true; 4425 return true;
4426 } 4426 }
4427 else 4427 else
4504 thisb->SetRecoveryTime(100); 4504 thisb->SetRecoveryTime(100);
4505 pTurnEngine->ApplyPlayerAction(); 4505 pTurnEngine->ApplyPlayerAction();
4506 } 4506 }
4507 else 4507 else
4508 { 4508 {
4509 thisb->SetRecoveryTime(flt_6BE3A4_debug_recmod1 * 213.3333333333333); 4509 thisb->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333));
4510 } 4510 }
4511 } 4511 }
4512 pMouse->RemoveHoldingItem(); 4512 pMouse->RemoveHoldingItem();
4513 return; 4513 return;
4514 } 4514 }
4799 thisb->SetRecoveryTime(100); 4799 thisb->SetRecoveryTime(100);
4800 pTurnEngine->ApplyPlayerAction(); 4800 pTurnEngine->ApplyPlayerAction();
4801 } 4801 }
4802 else 4802 else
4803 { 4803 {
4804 thisb->SetRecoveryTime(flt_6BE3A4_debug_recmod1 * 213.3333333333333); 4804 thisb->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333));
4805 } 4805 }
4806 } 4806 }
4807 pMouse->RemoveHoldingItem(); 4807 pMouse->RemoveHoldingItem();
4808 return; 4808 return;
4809 } 4809 }