# HG changeset patch
# User Ritor1
# Date 1355308605 -21600
# Node ID 12a0213e66c7b28a413244257576bf2a674466b5
# Parent  90a9c828c2a65be6efb5a874668bdb3b4d33ae35
Popup Window

diff -r 90a9c828c2a6 -r 12a0213e66c7 mm7_5.cpp
--- a/mm7_5.cpp	Wed Dec 12 12:52:40 2012 +0600
+++ b/mm7_5.cpp	Wed Dec 12 16:36:45 2012 +0600
@@ -15863,7 +15863,9 @@
         else
           v10 = pX - 414;
         pWindow.uFrameX = v10;
-        goto LABEL_42;
+        //goto LABEL_42;
+		pWindow.DrawMessageBox(0);
+        goto LABEL_132;
       }
       v9 = pX + pSRZBufferLineOffsets[pY];
       if ( !(pRenderer->pActiveZBuffer[v9] & 0xFFFF) )
@@ -15889,27 +15891,29 @@
 LABEL_119:
           if ( (signed int)pX > 467 && pCurrentScreen != 14 )
           {
-LABEL_126:
+//LABEL_126:
             identify_item();
             goto LABEL_132;
           }
           if ( (signed int)pY >= 345 )
             goto LABEL_132;
-          if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 100 )
+          if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 100 )//2DEvent - CharacerScreenStats
           {
             CharacterUI_StatsTab_ShowHint();
             goto LABEL_132;
           }
-          if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 101 )
+          if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 101 )//2DEvent - CharacerScreenSkills
           {
             CharacterUI_SkillsTab_ShowHint();
             goto LABEL_132;
           }
-          v11 = pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103;
-LABEL_125:
+          v11 = pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103;//2DEvent - CharacerScreenInventory
+//LABEL_125:
           if ( !v11 )
             goto LABEL_132;
-          goto LABEL_126;
+          //goto LABEL_126;
+		  identify_item();
+          goto LABEL_132;
         }
         if ( !dword_506364
           || (signed int)pX < (signed int)pViewport->uViewportX
@@ -15924,7 +15928,11 @@
         pWindow.uFrameWidth = LODWORD(v27);
         pWindow.uFrameX = pX + 5;
         pWindow.uFrameY = pY + 5;
-        goto LABEL_41;
+        //goto LABEL_41;
+		pWindow.uFrameHeight = 64;
+        pAudioPlayer->StopChannels(-1, -1);
+        pWindow.DrawMessageBox(0);
+        goto LABEL_132;
       }
       if (GetCurrentMenuID() > 0)
         goto LABEL_132;
@@ -15978,10 +15986,10 @@
         pWindow.uFrameWidth = 256;
         pWindow.uFrameX = 130;
         pWindow.uFrameY = 140;
-LABEL_41:
+//LABEL_41:
         pWindow.uFrameHeight = 64;
         pAudioPlayer->StopChannels(-1, -1);
-LABEL_42:
+//LABEL_42:
         pWindow.DrawMessageBox(0);
         goto LABEL_132;
       }
@@ -16038,14 +16046,19 @@
   if ( pCurrentScreen != 21 )
   {
     v11 = pCurrentScreen == 23;
-    goto LABEL_125;
+    //goto LABEL_125;
+    if ( !v11 )
+      goto LABEL_132;
+    identify_item();
+    goto LABEL_132;
   }
   pWindow.Hint = 0;
   pButton = pGUIWindow_CurrentMenu->pControlsHead;
   if ( !pButton )
     goto LABEL_132;
   v13 = pY;
-  pStr = v29;
+  //pStr = v29;
+  pStr = 0;
   while ( 1 )
   {
     if ( pButton->uButtonType != 1 && pButton->uButtonType != 3 || (signed int)pX < (signed int)pButton->uX || (signed int)pX > (signed int)pButton->uZ
@@ -16086,7 +16099,9 @@
             pStr = pGlobalTXT_LocalizationStrings[670];//Добавить
             pStr2 = pGlobalTXT_LocalizationStrings[671];//"Добавляет очко к выделенному навыку, забирая его из накопителя очков"
           }
-          goto LABEL_116;
+          //goto LABEL_116;
+		  pWindow.Hint = pStr2;
+		  goto LABEL_117;
         }
         pWindow.Hint = pAttributeDescriptions[(signed int)pButton->uControlParam % 7];
         pStr = aAttributeNames[(signed int)pButton->uControlParam % 7];
@@ -16097,13 +16112,17 @@
     {
       pStr2 = pGlobalTXT_LocalizationStrings[664];//Щелкните здесь для утверждения состава отряда и продолжения игры.
       pStr = pGlobalTXT_LocalizationStrings[665];//Кнопка ОК
-      goto LABEL_116;
+      //goto LABEL_116;
+	  pWindow.Hint = pStr2;
+      goto LABEL_117;
     }
     if ( pControlID == 67 )
     {
       pStr2 = pGlobalTXT_LocalizationStrings[666];//Сбрасывает все параметры и навыки отряда.
       pStr = pGlobalTXT_LocalizationStrings[667];//Кнопка Очистить
-      goto LABEL_116;
+      //goto LABEL_116;
+	  pWindow.Hint = pStr2;
+      goto LABEL_117;
     }
     if ( pControlID > 71 )
       break;
@@ -16119,7 +16138,7 @@
       v20 = pButton->uControlParam;
       pStr = pParty->pPlayers[v20].pName;
       pStr2 = pClassDescriptions[pParty->pPlayers[v20].uClass];
-LABEL_116:
+//LABEL_116:
       pWindow.Hint = pStr2;
       goto LABEL_117;
     }