Mercurial > mm7

comparison mm7_6.cpp @ 1448:5a5d0c713d47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some turn engine renaming
author Gloval
date Tue, 06 Aug 2013 00:52:46 +0400
parents 22cb507446a4
children 27b7ee003c7c
comparison
equal deleted inserted replaced
1369:6b4a1c44a56f 1448:5a5d0c713d47
2200 else 2200 else
2201 { 2201 {
2202 int main_hand_idx = player->pEquipment.uMainHand; 2202 int main_hand_idx = player->pEquipment.uMainHand;
2203 if (player->HasItemEquipped(EQUIP_MAIN_HAND)) 2203 if (player->HasItemEquipped(EQUIP_MAIN_HAND))
2204 v34 = pItemsTable->pItems[*(int *)&player->pInventoryItems[main_hand_idx - 1]].uSkillType; 2204 v34 = pItemsTable->pItems[*(int *)&player->pInventoryItems[main_hand_idx - 1]].uSkillType;
2205 pTurnEngine->_40471C(); 2205 pTurnEngine->ApplyPlayerAction();
2206 } 2206 }
2207 2207
2208 switch (v34) 2208 switch (v34)
2209 { 2209 {
2210 case 0: pAudioPlayer->PlaySound(SOUND_81, 0, 0, -1, 0, 0, 0, 0); break; 2210 case 0: pAudioPlayer->PlaySound(SOUND_81, 0, 0, -1, 0, 0, 0, 0); break;
3062 { 3062 {
3063 v24 = pPlayers[uActiveCharacter]->GetAttackRecoveryTime(false); 3063 v24 = pPlayers[uActiveCharacter]->GetAttackRecoveryTime(false);
3064 if ( !pParty->bTurnBasedModeOn ) 3064 if ( !pParty->bTurnBasedModeOn )
3065 pPlayers[uActiveCharacter]->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)v24 * 2.133333333333333)); 3065 pPlayers[uActiveCharacter]->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)v24 * 2.133333333333333));
3066 pCastSpellInfo.data()->_427D48(uActiveCharacter); 3066 pCastSpellInfo.data()->_427D48(uActiveCharacter);
3067 pTurnEngine->_40471C(); 3067 pTurnEngine->ApplyPlayerAction();
3068 } 3068 }
3069 } 3069 }
3070 break; 3070 break;
3071 case INPUT_Combat://if press ENTER 3071 case INPUT_Combat://if press ENTER
3072 if (pCurrentScreen == SCREEN_GAME) 3072 if (pCurrentScreen == SCREEN_GAME)