Mercurial > mm7

diff mm7_1.cpp @ 1091:9c7eb4037567

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
data moving
author Gloval
date Sun, 26 May 2013 14:13:22 +0400
parents 81a30c2e3e0a
children 81a51a0443e2
line wrap: on
line diff
--- a/mm7_1.cpp	Sun May 26 00:03:16 2013 +0400
+++ b/mm7_1.cpp	Sun May 26 14:13:22 2013 +0400
@@ -67,9 +67,9 @@
   GUIButton *i; // esi@2
   GUIButton *j; // esi@7
 
-  if ( dword_507CC0 )
+  if ( dword_507CC0_activ_ch )
   {
-    dword_507CC0 = 0;
+    dword_507CC0_activ_ch = 0;
     for ( i = pGUIWindow_CurrentMenu->pControlsHead; i; i = j )
     {
 	  j=i->pNext;
@@ -83,10 +83,10 @@
     {
       if ( j->msg == UIMSG_InventoryLeftClick)
       {
-        j->uX = dword_50698C;
-        j->uY = dword_506988;
-        j->uZ = dword_506984;
-        j->uW = dword_506980;
+        j->uX = dword_50698C_uX;
+        j->uY = dword_506988_uY;
+        j->uZ = dword_506984_uZ;
+        j->uW = dword_506980_uW;
         pGUIWindow_CurrentMenu->_41D08F_set_keyboard_control_group(1, 0, 0, 0);
       }
     }
@@ -296,49 +296,49 @@
         return true;
       }
       case VK_NEXT:
-      {
-        if ( pWindowList[v3].field_30 != 0 )
-        {
-          pMouse->GetClickPos(&uClickX, &uClickY);
-          v4 = pWindowList[v3].pStartingPosActiveItem;
-          v29 = v4 + pWindowList[v3].pNumPresenceButton;
-          if ( v4 < v4 + pWindowList[v3].pNumPresenceButton )
-          {
-            while ( 1 )
-            {
-              pButton = pWindowList[v3].pControlsHead;
-              if ( v4 > 0 )
-              {
-                v15 = v4;
-                do
-                {
-                  pButton = pButton->pNext;
-                  --v15;
-                }
-                while ( v15 );
-              }
-              if ( (signed int)uClickX >= (signed int)pButton->uX
-                && (signed int)uClickX <= (signed int)pButton->uZ
-                && (signed int)uClickY >= (signed int)pButton->uY
-                && (signed int)uClickY <= (signed int)pButton->uW )
-              {
-                pWindowList[v3].pCurrentPosActiveItem = v4;
-                return true;
-              }
-              ++v4;
-              if ( v4 >= v29 )
-              {
-                //v1 = 0;
-                //v2 = pMessageQueue_50CBD0->uNumMessages;
-                break;
-              }
-            }
-          }
-          else
-          {
-            //v2 = pMessageQueue_50CBD0->uNumMessages;
-          }
-        }
+      {  
+        //if ( pWindowList[v3].field_30 != 0 )   //crashed at skill draw
+        //{
+        //  pMouse->GetClickPos(&uClickX, &uClickY);
+        //  v4 = pWindowList[v3].pStartingPosActiveItem;
+        //  v29 = v4 + pWindowList[v3].pNumPresenceButton; //num buttons more than buttons 
+        //  if ( v4 < v29 )
+        //  {
+        //    while ( 1 )
+        //    {
+        //      pButton = pWindowList[v3].pControlsHead;
+        //      if ( v4 > 0 )
+        //      {
+        //        v15 = v4;
+        //        do
+        //        {
+        //          pButton = pButton->pNext;
+        //          --v15;
+        //        }
+        //        while ( v15 );
+        //      }
+        //      if ( (signed int)uClickX >= (signed int)pButton->uX
+        //        && (signed int)uClickX <= (signed int)pButton->uZ
+        //        && (signed int)uClickY >= (signed int)pButton->uY
+        //        && (signed int)uClickY <= (signed int)pButton->uW )
+        //      {
+        //        pWindowList[v3].pCurrentPosActiveItem = v4;
+        //        return true;
+        //      }
+        //      ++v4;
+        //      if ( v4 >= v29 )
+        //      {
+        //        //v1 = 0;
+        //        //v2 = pMessageQueue_50CBD0->uNumMessages;
+        //        break;
+        //      }
+        //    }
+        //  }
+        //  else
+        //  {
+        //    //v2 = pMessageQueue_50CBD0->uNumMessages;
+        //  }
+        //}
         break;
       }
       default: