Mercurial > mm7

diff mm7_5.cpp @ 315:2a09e1d6fc8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some 0041D895 GameUI_DrawItemInfo overhaul
author Nomad
date Wed, 20 Feb 2013 01:17:13 +0200
parents e33f5a1cdc46
children 981fbe2da232 5a66be213cff
line wrap: on
line diff
--- a/mm7_5.cpp	Tue Feb 19 22:06:49 2013 +0200
+++ b/mm7_5.cpp	Wed Feb 20 01:17:13 2013 +0200
@@ -7311,7 +7311,7 @@
       if ( v25 & 2 )
       {
         v27 = (Texture *)(v241 != -1 ? (int)&pIcons_LOD->pTextures[v241] : 0);
-        pRenderer->_4A6776(v24, a3b, v27);
+        pRenderer->DrawTransparentRedShade(v24, a3b, v27);
       }
       else
       {
@@ -7371,7 +7371,7 @@
                 if ( v37 & 2 )
                 {
                   v42 = (Texture *)(v41 != 0 ? (int)&pIcons_LOD->pTextures[v35] : 0);
-                  pRenderer->_4A6776(a2c, v36, v42);
+                  pRenderer->DrawTransparentRedShade(a2c, v36, v42);
                 }
                 else
                 {
@@ -7423,7 +7423,7 @@
                           if ( v49 & 2 )
                           {
                             v54 = (Texture *)(v53 != 0 ? (int)&pIcons_LOD->pTextures[v48] : 0);
-                            pRenderer->_4A6776(a2d, v47, v54);
+                            pRenderer->DrawTransparentRedShade(a2d, v47, v54);
                           }
                           else
                           {
@@ -7490,7 +7490,7 @@
                             if ( v62 & 2 )
                             {
                               v67 = (Texture *)(v65 != 0 ? (int)v66 : 0);
-                              pRenderer->_4A6776(a2e, a3e, v67);
+                              pRenderer->DrawTransparentRedShade(a2e, a3e, v67);
                             }
                             else
                             {
@@ -7553,7 +7553,7 @@
                                   if ( v76 & 2 )
                                   {
                                     v81 = (Texture *)(v79 != 0 ? (int)v80 : 0);
-                                    pRenderer->_4A6776(a2f, a3f, v81);
+                                    pRenderer->DrawTransparentRedShade(a2f, a3f, v81);
                                   }
                                   else
                                   {
@@ -7830,7 +7830,7 @@
                                                   if ( v128 & 2 )
                                                   {
                                                     v133 = (Texture *)(v131 != 0 ? (int)v132 : 0);
-                                                    pRenderer->_4A6776(a2j, a3i, v133);
+                                                    pRenderer->DrawTransparentRedShade(a2j, a3i, v133);
                                                   }
                                                   else
                                                   {
@@ -7871,7 +7871,7 @@
                                                     if ( v139 & 2 )
                                                     {
                                                       v144 = (Texture *)(v142 != 0 ? (int)v143 : 0);
-                                                      pRenderer->_4A6776(a2k, a3j, v144);
+                                                      pRenderer->DrawTransparentRedShade(a2k, a3j, v144);
                                                     }
                                                     else
                                                     {
@@ -7930,7 +7930,7 @@
                                                           if ( v155 & 2 )
                                                           {
                                                             v159 = (Texture *)(v243 != -1 ? (int)&pIcons_LOD->pTextures[v243] : 0);
-                                                            pRenderer->_4A6776(v150, a3k, v159);
+                                                            pRenderer->DrawTransparentRedShade(v150, a3k, v159);
                                                           }
                                                           else
                                                           {
@@ -8134,7 +8134,7 @@
                                                 if ( *(int *)(v225 + 20) & 2 )
                                                 {
                                                   v121 = (Texture *)(v119 != 0 ? (int)v120 : 0);
-                                                  pRenderer->_4A6776(a2h, a3h, v121);
+                                                  pRenderer->DrawTransparentRedShade(a2h, a3h, v121);
                                                 }
                                                 else
                                                 {
@@ -8335,7 +8335,7 @@
                                         v188 = v101;
                                         v175 = a3g;
                                         v163 = a2g;
-                                        v100->_4A6776(v163, v175, v188);
+                                        v100->DrawTransparentRedShade(v163, v175, v188);
                                         if ( !bRingsShownInCharScreen )
                                           pRenderer->_4A612A(a2g, a3g, v101, v235);
                                         v68 = v217;
@@ -8387,7 +8387,7 @@
                                         v175 = v104;
                                         v163 = v103;
                                         v100 = pRenderer;
-                                        v100->_4A6776(v163, v175, v188);
+                                        v100->DrawTransparentRedShade(v163, v175, v188);
                                         if ( !bRingsShownInCharScreen )
                                           pRenderer->_4A612A(a2g, a3g, v101, v235);
                                         v68 = v217;
@@ -8919,7 +8919,7 @@
     if ( v15 & 2 )
     {
       v20 = (Texture *)(v18 != 0 ? (int)v19 : 0);
-      pRenderer->_4A6776(a2a, a3a, v20);
+      pRenderer->DrawTransparentRedShade(a2a, a3a, v20);
     }
     else
     {
@@ -9079,7 +9079,7 @@
     if ( v6 & 2 )
     {
       v10 = (Texture *)(v9 != 0 ? (int)&pIcons_LOD->pTextures[v5] : 0);
-      pRenderer->_4A6776(a2, a3, v10);
+      pRenderer->DrawTransparentRedShade(a2, a3, v10);
     }
     else
     {
@@ -9123,7 +9123,7 @@
       v21 = 9 * v16;
       v22 = 493;
       v23 = (Texture *)(v20 != 0 ? (int)&pIcons_LOD->pTextures[8 * v21 / 0x48u] : 0);
-      pRenderer->_4A6776(0x1EDu, 0x5Bu, v23);
+      pRenderer->DrawTransparentRedShade(0x1EDu, 0x5Bu, v23);
     }
     else
     {
@@ -9203,7 +9203,7 @@
     if ( v29 & 2 )
     {
       v34 = v33 != 0 ? (int)&pIcons_LOD->pTextures[v28] : 0;
-      pRenderer->_4A6776(0x24Au, 0x58u, (Texture *)v34);
+      pRenderer->DrawTransparentRedShade(0x24Au, 0x58u, (Texture *)v34);
     }
     else
     {
@@ -11857,7 +11857,7 @@
             ++sDepthb )
       {
         v62 = &pIndoor->pFaces[(*(unsigned __int16 **)((char *)&v60->pWalls + v61))[sDepthb]];
-        if ( v62->uAttributes & 1
+        if ( v62->TwoSided()
           || v119 > v62->pBounding.x2
           || v123 < v62->pBounding.x1
           || v127 > v62->pBounding.y2
@@ -12023,7 +12023,7 @@
     while ( 1 )
     {
       v90 = &pIndoor->pFaces[(*(unsigned __int16 **)((char *)&v88->pWalls + v89))[v162]];
-      if ( v90->uAttributes & 1
+      if ( v90->TwoSided()
         || v120 > v90->pBounding.x2
         || v124 < v90->pBounding.x1
         || v128 > v90->pBounding.y2
@@ -15578,7 +15578,7 @@
             {
               if ( v26 < 800 )
               {
-                pItemGen.uAttributes |= 1u;
+                pItemGen.SetIdentified();
                 pItemGen.uItemID = v26;
                 if ( pItemsTable->pItems[v26].uEquipType == 12 )
                 {