Mercurial > mm7

diff Engine/Objects/Player.cpp @ 2554:f2a8ed07e921

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Game Main Menu separated from Game logic
author a.parshin
date Wed, 13 May 2015 11:31:58 +0200
parents c674d547cc7c
children 91c75d202d30
line wrap: on
line diff
--- a/Engine/Objects/Player.cpp	Wed May 13 02:20:05 2015 +0200
+++ b/Engine/Objects/Player.cpp	Wed May 13 11:31:58 2015 +0200
@@ -7604,11 +7604,11 @@
         enchantedItemPos = this->GetItemIDAtInventoryIndex(&invMatrixIndex);
         if ( enchantedItemPos )
         {
-         /* *((char *)pGUIWindow_Settings->ptr_1C + 8) &= 0x7Fu;
-          *((short *)pGUIWindow_Settings->ptr_1C + 2) = uActiveCharacter - 1;
-          *((int *)pGUIWindow_Settings->ptr_1C + 3) = enchantedItemPos - 1;
-          *((short *)pGUIWindow_Settings->ptr_1C + 3) = invMatrixIndex;*/
-          pSpellInfo = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
+         /* *((char *)pGUIWindow_CastTargetedSpell->ptr_1C + 8) &= 0x7Fu;
+          *((short *)pGUIWindow_CastTargetedSpell->ptr_1C + 2) = uActiveCharacter - 1;
+          *((int *)pGUIWindow_CastTargetedSpell->ptr_1C + 3) = enchantedItemPos - 1;
+          *((short *)pGUIWindow_CastTargetedSpell->ptr_1C + 3) = invMatrixIndex;*/
+          pSpellInfo = (CastSpellInfo *)pGUIWindow_CastTargetedSpell->ptr_1C;
           pSpellInfo->uFlags &= 0x7F;
           pSpellInfo->uPlayerID_2 = uActiveCharacter - 1;
           pSpellInfo->spell_target_pid = enchantedItemPos - 1;