Mercurial > mm7

changeset 980:a079c489118d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Speed Turn
author Ritor1
date Thu, 09 May 2013 21:19:59 +0600
parents 8b46828a64f4
children a6ef7125f6e4 062788391c88
files UIOptions.cpp mm7_5.cpp
diffstat 2 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/UIOptions.cpp	Thu May 09 13:04:27 2013 +0600
+++ b/UIOptions.cpp	Thu May 09 21:19:59 2013 +0600
@@ -369,9 +369,9 @@
 
   switch (uTurnSpeed)
   {
-    default:   pRenderer->DrawTextureIndexed(BtnTurnCoord[0], 270, pIcons_LOD->GetTexture(options_menu_skin.uTextureID_TurnSpeed[0]));
-    case 64:   pRenderer->DrawTextureIndexed(BtnTurnCoord[1], 270, pIcons_LOD->GetTexture(options_menu_skin.uTextureID_TurnSpeed[1]));
-    case 128:  pRenderer->DrawTextureIndexed(BtnTurnCoord[2], 270, pIcons_LOD->GetTexture(options_menu_skin.uTextureID_TurnSpeed[2]));
+    case 64:   pRenderer->DrawTextureIndexed(BtnTurnCoord[1], 270, pIcons_LOD->GetTexture(options_menu_skin.uTextureID_TurnSpeed[1])); break;
+    case 128:  pRenderer->DrawTextureIndexed(BtnTurnCoord[2], 270, pIcons_LOD->GetTexture(options_menu_skin.uTextureID_TurnSpeed[2])); break;
+    default:   pRenderer->DrawTextureIndexed(BtnTurnCoord[0], 270, pIcons_LOD->GetTexture(options_menu_skin.uTextureID_TurnSpeed[0])); break;
   }
 
   if (bWalkSound)  pRenderer->DrawTextureIndexed( 20, 303, pIcons_LOD->GetTexture(options_menu_skin.uTextureID_WalkSound));
--- a/mm7_5.cpp	Thu May 09 13:04:27 2013 +0600
+++ b/mm7_5.cpp	Thu May 09 21:19:59 2013 +0600
@@ -97,7 +97,7 @@
   char v48; // zf@405
   BLVFace *pBLVFace; // ecx@410
   ODMFace *pODMFace; // ecx@412
-  void *v51; // ecx@415
+  CastSpellInfo *v51; // ecx@415
   void *v52; // eax@424
   __int16 v53; // ax@431
   int v54; // eax@432
@@ -1740,7 +1740,7 @@
             v47 = pActors[v46].uAIState == Dead;
             if ( !v47 )
               continue;
-            v51 = pGUIWindow_Settings->ptr_1C;
+            v51 = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
             *((char *)v51 + 8) &= 0xBFu;
             *((short *)v51 + 2) = uMessageParam;
             *((int *)v51 + 3) = v44;
@@ -1759,7 +1759,7 @@
             v47 = (pObjectList->pObjects[pSpriteObjects[v46].uObjectDescID].uFlags & 0x10) == 0;
             if ( !v47 )
               continue;
-            v51 = pGUIWindow_Settings->ptr_1C;
+            v51 = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
             *((char *)v51 + 8) &= 0xBFu;
             *((short *)v51 + 2) = uMessageParam;
             *((int *)v51 + 3) = v44;
@@ -1788,7 +1788,7 @@
                 continue;
               v44 = uNumSeconds;
               //goto LABEL_415;
-              v51 = pGUIWindow_Settings->ptr_1C;
+              v51 = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
               *((char *)v51 + 8) &= 0xBFu;
               *((short *)v51 + 2) = uMessageParam;
               *((int *)v51 + 3) = v44;
@@ -1810,7 +1810,7 @@
           if ( v48 )
             continue;
 //LABEL_415:
-          v51 = pGUIWindow_Settings->ptr_1C;
+          v51 = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
           *((char *)v51 + 8) &= 0xBFu;
 //LABEL_416:
           *((short *)v51 + 2) = uMessageParam;
@@ -2357,7 +2357,7 @@
           }
           _42777D_CastSpell_UseWand_ShootArrow(pPlayer2->uQuickSpell, uActiveCharacter - 1, 0, 0, uActiveCharacter);
           continue;
-        case UIMSG_CastSpell_SmallShot://FireBlow, Lightning, Ice Lightning, Swarm, hand hammer
+        case UIMSG_CastSpell_SmallShot://FireBlow, Lightning, Ice Lightning, Swarm, 
         case UIMSG_CastSpell_GreatShot://Fireball, Spraying poison and other
           if ( pRenderer->pRenderD3D )
           {
@@ -2374,15 +2374,15 @@
           v84 = v83 >> 16;
           if ( PID_TYPE(v44) != 3 || v84 >= 5120 )
             //goto LABEL_90;
-            {
+          {
             v1 = "";
             //v0 = 1;
             continue;
           }
-          v51 = pGUIWindow_Settings->ptr_1C;
+          v51 = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
           if ( uMessage == 70 )
           {
-            *((char *)v51 + 8) &= 0xF7u;
+            *((char *)v51 + 8) &= 247;
           }
           else
           {
@@ -2394,7 +2394,7 @@
           //goto LABEL_416;
           *((short *)v51 + 2) = uMessageParam;
           *((int *)v51 + 3) = v44;
-          pParty->pPlayers[*((short *)v51 + 1)].SetRecoveryTime(300);
+          pParty->pPlayers[v51->uPlayerID].SetRecoveryTime(300);
           pWindow3 = pGUIWindow_Settings;
           pWindow3->Release();
           pGUIWindow_Settings = 0;