Mercurial > mm7

changeset 16:e1afcd54fddd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 17 Jan 2013 09:24:40 +0600
parents b4982f23d2e9 (current diff) 0ea5768a2f0d (diff)
children fe0d9a98213f
files
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_1.cpp	Thu Jan 17 09:24:33 2013 +0600
+++ b/mm7_1.cpp	Thu Jan 17 09:24:40 2013 +0600
@@ -5007,8 +5007,8 @@
   signed int v30; // ecx@88
   const char *v31; // eax@91
   __int16 v32; // fps@109
-  unsigned __int8 v33; // c0@109
-  unsigned __int8 v34; // c3@109
+  //unsigned __int8 v33; // c0@109
+  //unsigned __int8 v34; // c3@109
   enum UIMessageType pMessageType2; // esi@110
   int v36; // edx@111
   enum UIMessageType pMessageType3; // edx@117
@@ -5025,7 +5025,7 @@
 
   pMouse->uPointingObjectID = 0;
   pMouse->GetClickPos(&pX, &pY);
-  if ( pX || (signed int)pX > 639 || pY || (signed int)pY > 479 )//( (pX & 0x80000000u) != 0 || (signed int)pX > 639 || (pY & 0x80000000u) != 0 || (signed int)pY > 479 )
+  if ( pX < 0 || (signed int)pX > 639 || pY < 0 || (signed int)pY > 479 )//( (pX & 0x80000000u) != 0 || (signed int)pX > 639 || (pY & 0x80000000u) != 0 || (signed int)pY > 479 )
     return;
   if ( !pCurrentScreen )
   {
@@ -5446,8 +5446,8 @@
               if ( (double)(signed int)pButton->uHeight != 0.0 )
               {
                  //UNDEF(v32);
-                if ( v33 | v34 )
-                {
+                //if ( v33 | v34 )
+                //{
                   pMessageType2 = (UIMessageType)pButton->field_1C;
                   if ( pMessageType2 != 0 )
                   {
@@ -5470,7 +5470,7 @@
                   sub_41C0B8_set_status_string(v13);
                   uLastPointedObjectID = 1;
                   return;
-                }
+                //}
               }
             }
           }
@@ -5574,9 +5574,9 @@
               if ( (double)(signed int)pButton->uHeight != 0.0 )
               {
                 //UNDEF(v8);
-                if ( v9 | v10 )
+                //if ( v9 | v10 )
                   //goto LABEL_24;
-                {
+                //{
                   pMessageType1 = (UIMessageType)pButton->field_1C;
                   if ( pMessageType1 )
                   {
@@ -5593,7 +5593,7 @@
                   sub_41C0B8_set_status_string(v13);
                   uLastPointedObjectID = 1;
                   return;
-                }
+                //}
               }
             }
           }