diff UI/UIPopup.cpp @ 1842:175bf8da83d9

Merge
author Grumpy7
date Sun, 13 Oct 2013 06:32:06 +0200
parents 211dfe2d8db1 303a56458f7b
children 2e6d3cd052e0
line wrap: on
line diff
--- a/UI/UIPopup.cpp	Fri Oct 11 10:12:29 2013 +0200
+++ b/UI/UIPopup.cpp	Sun Oct 13 06:32:06 2013 +0200
@@ -1594,17 +1594,17 @@
   double v31; // st7@112
   Vec3_int_ v39; // [sp-18h] [bp-A8h]@83
   GUIWindow message_window; // [sp+Ch] [bp-84h]@137
-  POINT a2; // [sp+78h] [bp-18h]@2
+  POINT cursor; // [sp+78h] [bp-18h]@2
   unsigned int damage_level; // [sp+8Ch] [bp-4h]@23
 
   if (no_rightlick_in_inventory)
     return;
 
-  pMouse->GetCursorPos(&a2);
-  int item_pid = (pRenderer->pActiveZBuffer[a2.x + pSRZBufferLineOffsets[a2.y]] & 0xFFFF) - 1;
+  pMouse->GetCursorPos(&cursor);
+  int item_pid = (pRenderer->pActiveZBuffer[cursor.x + pSRZBufferLineOffsets[cursor.y]] & 0xFFFF) - 1;
   auto item = &pPlayers[uActiveCharacter]->pInventoryItemList[item_pid];
 
-  if (a2.x <= 13 || a2.x >= 462)//items out of inventory(вещи вне инвентаря)
+  if (cursor.x <= 13 || cursor.x >= 462)//items out of inventory(вещи вне инвентаря)
   {
     GameUI_DrawItemInfo(item);
     return;
@@ -1612,8 +1612,8 @@
 
   if (!item_pid)
   {
-    int inventory_mouse_x = a2.x - 14;
-    int inventory_mouse_y = a2.y - 17;
+    int inventory_mouse_x = cursor.x - 14;
+    int inventory_mouse_y = cursor.y - 17;
 
     int mouse_cell_x = inventory_mouse_x / 32;
     int mouse_cell_y = inventory_mouse_y / 32;
@@ -1637,10 +1637,10 @@
     message_window.Hint = pTmpBuf.data();
     message_window.uFrameWidth = 384;
     message_window.uFrameHeight = 180;
-    if (a2.x <= 320 )
-      message_window.uFrameX = a2.x + 30;
+    if (cursor.x <= 320 )
+      message_window.uFrameX = cursor.x + 30;
     else
-      message_window.uFrameX = a2.x - 414;
+      message_window.uFrameX = cursor.x - 414;
     message_window.uFrameY = 40;
     message_window.DrawMessageBox(0);
     return;