diff mm7_5.cpp @ 996:bdbbdfa77ea6

UIMSG_ClickBooksBtn
author Ritor1
date Tue, 14 May 2013 10:07:21 +0600
parents 087a9af8e0ec
children 1c13fbaad0c5
line wrap: on
line diff
--- a/mm7_5.cpp	Mon May 13 18:03:55 2013 +0600
+++ b/mm7_5.cpp	Tue May 14 10:07:21 2013 +0600
@@ -155,12 +155,6 @@
   Player *pPlayer5; // ST78_4@758
   unsigned int v107; // eax@758
   unsigned int v108; // eax@758
-  char *v109; // ST64_4@759
-  Player *v110; // ST78_4@759
-  int v111; // ST60_4@759
-  int v112; // ST5C_4@759
-  char *v113; // ST58_4@759
-  signed int v114; // eax@759
   unsigned int v115; // eax@764
   int v116; // eax@776
   POINT *pPoint3; // eax@777
@@ -3015,7 +3009,7 @@
           GUIWindow::Create(pCharacterScreen_AwardsBtn->uX, pCharacterScreen_AwardsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_AwardsBtn, 0);
           FillAwardsData();
           continue;
-        case UIMSG_AutonotesBook://не только Автозаметки (в процессе)
+        case UIMSG_ClickBooksBtn:
           switch ( uMessageParam )
           {
             case 11://Page UP
@@ -3026,12 +3020,12 @@
               BtnDown_flag = 1;
               pButton = pBtn_Book_1;
               break;
-            case 0:
+            case 0://Zoom plus
               pButton = pBtn_Book_1;
               BtnDown_flag = 1;
               break;
-            case 1:
-              pButton = pBtn_Book_2;//увеличить в MapsBook
+            case 1://Zoom minus
+              pButton = pBtn_Book_2;
               BtnUp_flag = 1;
               break;
             case 2://Potions
@@ -3115,13 +3109,9 @@
           pMouse->uPointingObjectID = PID(OBJECT_Player,v108);
           continue;
         case UIMSG_ShowStatus_ManaHP:
-          v109 = pGlobalTXT_LocalizationStrings[212];// "Spell Points"
-          v110 = pPlayers[uMessageParam];
-          v111 = v110->GetMaxMana();
-          v112 = v110->sMana;
-          v113 = pGlobalTXT_LocalizationStrings[108];// "Hit Points"
-          v114 = v110->GetMaxHealth();
-          sprintf(pTmpBuf, "%d / %d %s    %d / %d %s", v110->sHealth, v114, v113, v112, v111, v109);
+          sprintf(pTmpBuf, "%d / %d %s    %d / %d %s", pPlayers[uMessageParam]->sHealth, pPlayers[uMessageParam]->GetMaxHealth(), 
+                  pGlobalTXT_LocalizationStrings[108], pPlayers[uMessageParam]->sMana, pPlayers[uMessageParam]->GetMaxMana(), 
+                  pGlobalTXT_LocalizationStrings[212]);
           sub_41C0B8_set_status_string(pTmpBuf);
           continue;
         case UIMSG_CHEST_ClickItem:
@@ -3145,7 +3135,6 @@
           }
           v115 = pMessageQueue_50CBD0->uNumMessages;
           if ( !pMessageQueue_50CBD0->uNumMessages )
-            //goto LABEL_768;
           {
             pMessageQueue_50CBD0->AddMessage(UIMSG_MouseLeftClickInScreen, 0, 0);
             /*if ( (signed int)v115 < 40 )
@@ -3219,7 +3208,7 @@
           if ( pCurrentScreen )
             continue;
           pParty->uFlags |= 2u;
-          GUIWindow::Create(0x207u, 0x88u, 0, 0, WINDOW_PressedButton2, (int)pBtn_ZoomOut, 0);
+          GUIWindow::Create(519, 136, 0, 0, WINDOW_PressedButton2, (int)pBtn_ZoomOut, 0);
           uNumSeconds = 131072;
           v118 = 2 * viewparams->uMinimapZoom;
           ++viewparams->field_28;
@@ -3249,7 +3238,7 @@
           if ( pCurrentScreen )
             continue;
           pParty->uFlags |= 2u;
-          GUIWindow::Create(0x23Eu, 0x88u, 0, 0, WINDOW_PressedButton2, (int)pBtn_ZoomIn, 0);
+          GUIWindow::Create(574, 136, 0, 0, WINDOW_PressedButton2, (int)pBtn_ZoomIn, 0);
           uNumSeconds = 32768;
           v118 = (unsigned __int64)((signed __int64)(signed int)viewparams->uMinimapZoom << 15) >> 16;
           --viewparams->field_28;