Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_6.cpp	Mon Jul 15 08:20:28 2013 +0400
+++ b/mm7_6.cpp	Tue Aug 06 00:52:46 2013 +0400
@@ -2202,7 +2202,7 @@
     int main_hand_idx = player->pEquipment.uMainHand;
     if (player->HasItemEquipped(EQUIP_MAIN_HAND))
       v34 = pItemsTable->pItems[*(int *)&player->pInventoryItems[main_hand_idx - 1]].uSkillType;
-    pTurnEngine->_40471C();
+    pTurnEngine->ApplyPlayerAction();
   }
 
   switch (v34)
@@ -3064,7 +3064,7 @@
                 if ( !pParty->bTurnBasedModeOn )
                   pPlayers[uActiveCharacter]->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)v24 * 2.133333333333333));
                 pCastSpellInfo.data()->_427D48(uActiveCharacter);
-                pTurnEngine->_40471C();
+                pTurnEngine->ApplyPlayerAction();
               }
             }
             break;