Mercurial > mm7

diff mm7_5.cpp @ 274:a9f58ca01454

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 18 Feb 2013 16:37:17 +0600
parents e5afd6848268 6e585f21a01e
children 250e49fef6f6
line wrap: on
line diff
--- a/mm7_5.cpp	Mon Feb 18 16:37:04 2013 +0600
+++ b/mm7_5.cpp	Mon Feb 18 16:37:17 2013 +0600
@@ -2729,7 +2729,8 @@
               Actor::StealFrom(uMessageParam);
           }
           continue;
-        case 0x17:
+
+        case UIMSG_Attack:
           if ( !uActiveCharacter )
             //goto LABEL_90;
           {
@@ -16516,8 +16517,7 @@
     y = pY;
     x = pX;
   }
-  if ( pCurrentScreen
-    || !dword_507B98_ctrl_pressed )
+  if ( pCurrentScreen != SCREEN_GAME || !dword_507B98_ctrl_pressed )
     goto LABEL_30;
   v4 = GetCurrentMenuID();
   x = pX;
@@ -16564,7 +16564,7 @@
     if ( x >= (signed int)i->uX && x <= (signed int)i->uZ && y >= (signed int)i->uY && y <= (signed int)i->uW )
     {
 LABEL_50:
-      i->field_2C = 1;
+      i->field_2C_is_pushed = 1;
       v10 = pMessageQueue_50CBD0->uNumMessages;
       if ( pMessageQueue_50CBD0->uNumMessages )
       {