Mercurial > mm7

changeset 1725:8de9b24ace86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Wed, 25 Sep 2013 12:22:32 +0600
parents 8bf9a9d9740b
children 9e81a9147752
files UI/Books/UIMapBook.cpp UI/UIPopup.cpp mm7_5.cpp
diffstat 3 files changed, 1 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/UI/Books/UIMapBook.cpp	Wed Sep 25 11:13:16 2013 +0600
+++ b/UI/Books/UIMapBook.cpp	Wed Sep 25 12:22:32 2013 +0600
@@ -373,15 +373,11 @@
     v30 = (double)(1 << (16 - pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2));
 
     teal = (unsigned int)(signed __int64)((double)(viewparams->sViewCenterX - 22528 / (viewparams->uMapBookMapZoom / 384) + 32768) / v30) << 16;
-    //  v97 = (const void *)((unsigned int)(signed __int64)((double)(v6 - 22528 / (v5 / 384) + 32768) / v30) << 16);
 
-    //   v32 = map_texture_16;
     textr_width = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uTextureWidth;
     stepY_r =            (int)(signed __int64)((double)(- pCenterY - 22528 / (viewparams->uMapBookMapZoom / 384)+ 32768) / v30) << 16;
-    //   v81 =   (signed __int16)(signed __int64)((double)(v6 - 22528 / (v5 / 384) + 32768) / v30);
     black = (signed __int16)(signed __int64)((double)(viewparams->sViewCenterX - 22528 / (viewparams->uMapBookMapZoom / 384) + 32768) / v30);
 
-    //  v76 = textr_width;
     scaled_posY = stepY_r >> 16;
     //nearest neiborhood scaling
     if ( texture8_data)  
@@ -468,7 +464,6 @@
     }
   }
   v47 = ((unsigned __int64)((pParty->vPosition.x - viewparams->sViewCenterX) * (signed __int64)viewparams->uMapBookMapZoom) >> 16) + screenCenter_X - 3;
-  //v81 = pParty->vPosition.y - pCenterY;
   v97 = (const void *)((unsigned __int64)((pParty->vPosition.y - pCenterY) * (signed __int64)viewparams->uMapBookMapZoom) >> 16);
   v48 = 1;
   v49 = screenCenterY - (int)v97 - 3;
@@ -556,16 +551,12 @@
     screenCenterY = br_x - tl_x + 1;
     v95 = br_y - tl_y + 1;
     v77 = &pRenderer->pTargetSurface[tl_x + tl_y * pRenderer->uTargetSurfacePitch];
-    //v56 = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2;
     black = (1 << (pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2 + 16)) / viewparams->uMapBookMapZoom;
     v57 = (double)(1 << (16 - pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2));
-    //v58 = 22528 / (viewparams->uMapBookMapZoom / 384);
-    //v59 = (signed __int64)((double)(viewparams->sViewCenterX - (22528 / (viewparams->uMapBookMapZoom / 384)) + 32768) / v57);
     v60 = (int)((signed __int64)((double)(viewparams->sViewCenterX - (22528 / (viewparams->uMapBookMapZoom / 384)) + 32768) / v57)) << 16;
     teal = v60 >> 16;
     pPalette_16 = (unsigned __int16 *)(v60 >> 16);
     v97 = (const void *)((int)((signed __int64)((double)(viewparams->sViewCenterX - (22528 / (viewparams->uMapBookMapZoom / 384)) + 32768) / v57)) << 16);
-    //v61 = (signed __int64)((double)(32768 - (22528 / (viewparams->uMapBookMapZoom / 384)) - pCenterY) / v57);
     v62 = (int)((signed __int64)((double)(32768 - (22528 / (viewparams->uMapBookMapZoom / 384)) - pCenterY) / v57)) << 16;
     v63 = (signed __int16)((signed __int64)((double)(32768 - (22528 / (viewparams->uMapBookMapZoom / 384)) - pCenterY) / v57));
     a4a = map_texture_16;
--- a/UI/UIPopup.cpp	Wed Sep 25 11:13:16 2013 +0600
+++ b/UI/UIPopup.cpp	Wed Sep 25 12:22:32 2013 +0600
@@ -1507,11 +1507,8 @@
         CharacterUI_StatsTab_ShowHint();
       else if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 101 )//2DEvent - CharacerScreenSkills
         CharacterUI_SkillsTab_ShowHint();
-      else
-      {
-        if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 )//2DEvent - CharacerScreenInventory
+      else if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 )//2DEvent - CharacerScreenInventory
           OnInventoryItemRightClick();
-      }
       break;
     }
     case SCREEN_SPELL_BOOK:
--- a/mm7_5.cpp	Wed Sep 25 11:13:16 2013 +0600
+++ b/mm7_5.cpp	Wed Sep 25 12:22:32 2013 +0600
@@ -4909,20 +4909,8 @@
 //----- (00416196) --------------------------------------------------------
 void OnInventoryItemRightClick()
 {
-  //Player *v0; // esi@2
-  //POINT *v1; // edi@2
-  //signed int v2; // ecx@5
-  //signed int v3; // eax@5
-  //int v4; // eax@5
-  //char v5; // sf@5
-  //int v6; // eax@5
   int v7; // eax@7
-  //unsigned __int16 v8; // ax@10
   int v9; // edi@10
-  //int v10; // eax@10
-  //int v11; // edx@13
-  //LONG v12; // edx@23
-  //signed int v13; // edx@23
   int v14; // edx@25
   unsigned int v15; // edi@25
   signed int v16; // edx@27
@@ -4937,29 +4925,13 @@
   int v25; // eax@80
   int v26; // eax@84
   ItemGen *v27; // esi@98
-  //unsigned int v28; // eax@98
-  //ItemGen *v29; // edi@98
-  //unsigned int v30; // ecx@103
   double v31; // st7@112
-  //unsigned __int64 v32; // qax@113
-  //unsigned int v33; // ecx@117
-  //int v34; // eax@126
-  //unsigned int v35; // ecx@127
   double v36; // st7@132
   signed __int64 v37; // qax@135
-  //unsigned int v38; // eax@138
   Vec3_int_ v39; // [sp-18h] [bp-A8h]@83
-  //int *v40; // [sp-Ch] [bp-9Ch]@83
-  //int *v41; // [sp-8h] [bp-98h]@83
-  //int *v42; // [sp-4h] [bp-94h]@83
   GUIWindow v43; // [sp+Ch] [bp-84h]@137
-  //unsigned int pY; // [sp+60h] [bp-30h]@2
   int v45; // [sp+64h] [bp-2Ch]@10
-  //unsigned int pX; // [sp+68h] [bp-28h]@2
-  //int v47; // [sp+6Ch] [bp-24h]@25
-  //POINT y; // [sp+70h] [bp-20h]@2
   POINT a2; // [sp+78h] [bp-18h]@2
-  //Vec3_int_ pOut; // [sp+80h] [bp-10h]@2
   unsigned int v51; // [sp+8Ch] [bp-4h]@23
 
   if (no_rightlick_in_inventory)