diff GUIWindow.cpp @ 1138:f947bedb2859

Слияние
author Ritor1
date Sat, 01 Jun 2013 10:32:31 +0600
parents ca415f6bac1c
children 502b8b2e36b4
line wrap: on
line diff
--- a/GUIWindow.cpp	Sat Jun 01 10:32:08 2013 +0600
+++ b/GUIWindow.cpp	Sat Jun 01 10:32:31 2013 +0600
@@ -175,7 +175,7 @@
           return result;
         }
       }
-      if ( v4->uFrameX || v4->uFrameY || !(v4->uFrameWidth == 640 & v4->uFrameHeight == 480) )
+      if ( v4->uFrameX || v4->uFrameY || !(v4->uFrameWidth == 640 && v4->uFrameHeight == 480) )
       {
         --v2;
         if ( v2 >= 0 )
@@ -905,7 +905,7 @@
   }
   //while ( (signed int)v3 < 11 );
 
-  CreateButton(0, 0, 0, 0, 1, 0, UIMSG_33, 0, '\t', "", 0);
+  CreateButton(0, 0, 0, 0, 1, 0, UIMSG_SpellBook_PressTab, 0, '\t', "", 0);
   if ( a2 )
     _41D08F_set_keyboard_control_group(a2, 0, 0, 0);