Mercurial > mm7

diff mm7_2.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 3dcc9d945eeb
children ce39b96acf5c
line wrap: on
line diff
--- a/mm7_2.cpp	Tue Feb 19 22:06:49 2013 +0200
+++ b/mm7_2.cpp	Wed Feb 20 01:17:13 2013 +0200
@@ -1446,7 +1446,7 @@
                   v85 = 0;
                   v83 = 4;
                   v4 = (ItemGen *)&_this->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * (int)result + 5];
-                  if ( !(v4->uAttributes & 1) )
+                  if (!v4->Identified())
                   {
                     v81 = ptr_507BC0->ptr_1C;
                     v79 = v4;
@@ -1845,7 +1845,7 @@
         v93 = 0;
         v91 = 4;
         v37 = (ItemGen *)&_this->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * (int)result + 5];
-        if ( !(v37->uAttributes & 1) )
+        if (!v37->Identified())
         {
           v89 = ptr_507BC0->ptr_1C;
           v87 = v37;
@@ -2894,7 +2894,7 @@
           if ( v2 )
           {
             v3 = (ItemGen *)&v0->pInventoryItems[v2-1];
-            if ( v3->uAttributes & 1 )
+            if (v3->Identified())
             {
               v118 = ptr_507BC0->ptr_1C;
               v4 = uActiveCharacter - 1;
@@ -4595,7 +4595,7 @@
     if ( v25 )
     {
       v26 = 1;
-      v20->uAttributes |= 1u;
+      v20->SetIdentified();
       memcpy(&v0->pInventoryItems[v25-1], v20, 0x24u);
       goto LABEL_42;
     }
@@ -4663,7 +4663,7 @@
     v39 = v0->AddItem(0xFFFFFFFFu, v32->uItemID);
     if ( v39 )
     {
-      v32->uAttributes |= 1u;
+      v32->SetIdentified();
       v7 = v73 == 1;
       v40 = (int)((char *)v0 + 36 * v39);
       memcpy((void *)(v40 + 496), v32, 0x24u);
@@ -8003,7 +8003,7 @@
                   }
                   v18 = v15;
                 }
-                a1a.stru_24.uAttributes |= 1u;
+                a1a.stru_24.SetIdentified();
                 a1a.uObjectDescID = v18;
                 a1a.stru_24.uAdditionalValue = v34;
                 goto LABEL_35;
@@ -8162,7 +8162,7 @@
                     }
                   }
 LABEL_23:
-                  v3->uAttributes |= 1u;
+                  v3->SetIdentified();
                   v3->uAdditionalValue = v10;
 LABEL_25:
                   v11 = v4 - 1;