# HG changeset patch
# User Ritor1
# Date 1372649195 -21600
# Node ID 8433de6fd7d03ed4d3da6ca2cc9a420fc80bf9b3
# Parent  e70fe5d779286bd713625c2a58baf45923b6443a# Parent  65d301bce71737d85e8f4a316be53b341bd80be2
Слияние

diff -r 65d301bce717 -r 8433de6fd7d0 CastSpellInfo.cpp
--- a/CastSpellInfo.cpp	Mon Jul 01 00:00:49 2013 +0400
+++ b/CastSpellInfo.cpp	Mon Jul 01 09:26:35 2013 +0600
@@ -4387,7 +4387,7 @@
           return;
 
         pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, WINDOW_CastSpell, (int)&pCastSpellInfo[result], 0);
-        pGUIWindow_Settings->CreateButton(game_viewport_x, game_viewport_y, game_viewport_width, game_viewport_height, 1, 0, UIMSG_CastSpell_BE, 0, 0, "", 0);
+        pGUIWindow_Settings->CreateButton(game_viewport_x, game_viewport_y, game_viewport_width, game_viewport_height, 1, 0, UIMSG_CastSpell_Telekinesis, 0, 0, "", 0);
         sub_421B2C_PlaceInInventory_or_DropPickedItem();
         return;
       }
diff -r 65d301bce717 -r 8433de6fd7d0 GUIWindow.h
--- a/GUIWindow.h	Mon Jul 01 00:00:49 2013 +0400
+++ b/GUIWindow.h	Mon Jul 01 09:26:35 2013 +0600
@@ -151,7 +151,7 @@
   UIMSG_ToggleShowDamage = 187,
   UIMSG_ScrollNPCPanel = 188,
   UIMSG_BD = 189,
-  UIMSG_CastSpell_BE = 190,
+  UIMSG_CastSpell_Telekinesis = 190,
   UIMSG_BF = 191,
   UIMSG_ClickAwardScrollBar = 192,
   UIMSG_C1 = 192,
diff -r 65d301bce717 -r 8433de6fd7d0 mm7_5.cpp
--- a/mm7_5.cpp	Mon Jul 01 00:00:49 2013 +0400
+++ b/mm7_5.cpp	Mon Jul 01 09:26:35 2013 +0600
@@ -1774,12 +1774,9 @@
           pCurrentScreen = SCREEN_GAME;
           viewparams->bRedrawGameUI = 1;
           continue;
-        case UIMSG_CastSpell_BE://???
-          __debugbreak();
+        case UIMSG_CastSpell_Telekinesis:
           if ( pRenderer->pRenderD3D )
-          {
             LOWORD(v42) = pGame->pVisInstance->get_picked_object_zbuf_val();
-          }
           else
           {
             uNumSeconds = (unsigned int)pMouse->GetCursorPos(&v210);