Mercurial > mm7

changeset 1024:d353bd3009d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 15 May 2013 09:32:39 +0600
parents 54f74d2c894f (current diff) 9318dd3f3711 (diff)
children 8b492d4722d4
files
diffstat 1 files changed, 9 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_6.cpp	Wed May 15 09:32:33 2013 +0600
+++ b/mm7_6.cpp	Wed May 15 09:32:39 2013 +0600
@@ -8787,14 +8787,13 @@
             }
             else
             {
-              /*if ( dword_50C9E8 < 40 )
+              if ( dword_50C9E8 < 40 )
               {
                 dword_50C9EC[3 * dword_50C9E8] = 25;
                 dword_50C9EC[3 * dword_50C9E8 + 1] = 0;
                 dword_50C9EC[3 * dword_50C9E8 + 2] = 0;
                 ++dword_50C9E8;
-              }*/
-              pMessageQueue_50CBD0->AddMessage(UIMSG_CastQuickSpell, 0, 0);
+              }
             }
             break;
           case INPUT_Attack:
@@ -8833,13 +8832,12 @@
             }
             break;
           case INPUT_CharCycle:
-            if ( pCurrentScreen == SCREEN_SPELL_BOOK )// || dword_50C9E8 >= 40 )
+            if ( pCurrentScreen == SCREEN_SPELL_BOOK || dword_50C9E8 >= 40 )
               break;
-            /*dword_50C9EC[3 * dword_50C9E8] = 176;
+            dword_50C9EC[3 * dword_50C9E8] = 176;
             dword_50C9EC[3 * dword_50C9E8 + 1] = 0;
             dword_50C9EC[3 * dword_50C9E8 + 2] = 0;
-            ++dword_50C9E8;*/
-            pMessageQueue_50CBD0->AddMessage(UIMSG_CycleCharacters, 0, 0);
+            ++dword_50C9E8;
             break;
           case INPUT_LookUp:
             if ( pEventTimer->bPaused )
@@ -8880,23 +8878,21 @@
             }
             break;
           case INPUT_ZoomIn:
-            /*if ( dword_50C9E8 >= 40 )
+            if ( dword_50C9E8 >= 40 )
               break;
             dword_50C9EC[3 * dword_50C9E8] = 367;
             dword_50C9EC[3 * dword_50C9E8 + 1] = 0;
             dword_50C9EC[3 * dword_50C9E8 + 2] = 0;
-            ++dword_50C9E8;*/
-            pMessageQueue_50CBD0->AddMessage(UIMSG_ClickZoomOutBtn, 0, 0);
+            ++dword_50C9E8;
             break;
           case INPUT_ZoomOut:
-            /*if ( dword_50C9E8 < 40 )
+            if ( dword_50C9E8 < 40 )
             {
               dword_50C9EC[3 * dword_50C9E8] = 368;
               dword_50C9EC[3 * dword_50C9E8 + 1] = 0;
               dword_50C9EC[3 * dword_50C9E8 + 2] = 0;
               ++dword_50C9E8;
-            }*/
-            pMessageQueue_50CBD0->AddMessage(UIMSG_ClickZoomInBtn, 0, 0);
+            }
             break;
           case INPUT_AlwaysRun:
             bAlwaysRun = bAlwaysRun == 0;