Mercurial > mm7

diff mm7_4.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 f16ac5e65438
children 922a96fdcc86
line wrap: on
line diff
--- a/mm7_4.cpp	Tue Feb 19 22:06:49 2013 +0200
+++ b/mm7_4.cpp	Wed Feb 20 01:17:13 2013 +0200
@@ -5178,7 +5178,7 @@
           v35 = *v26;
           v36 = a3->GetValue();
           v29 = pPlayer->_4B8102(v36, v35);
-          if ( a3->uAttributes & 2 )
+          if (a3->Broken())
             v29 = 1;
           goto _continue_sprintf;
         }
@@ -5197,7 +5197,7 @@
               v30 = *v26;
               v31 = a3->GetValue();
               v29 = pPlayer->_4B8102(v31, v30) / 2;
-              if ( a3->uAttributes & 2 )
+              if (a3->Broken())
                 v29 = 1;
               if (!v29)
                 v29 = 1;
@@ -6097,7 +6097,7 @@
       for (uint k = 0; k < 138; k++)
       {
         if (&player->pInventoryItems[k])
-          player->pInventoryItems[k].uAttributes |= 1;
+          player->pInventoryItems[k].SetIdentified();
       }
     }
   }
@@ -12815,8 +12815,7 @@
   v4 = a1->uItemID;
   v5 = pItemsTable->pItems[v4].uEquipType;
   if ( (v2 != 4 || (signed int)v3 < 740 || (signed int)v3 > 771)
-    && ((signed int)v3 >= 600 || (signed int)v3 >= 529 && (signed int)v3 <= 599)
-    || BYTE1(a1->uAttributes) & 1 )
+    && ((signed int)v3 >= 600 || (signed int)v3 >= 529 && (signed int)v3 <= 599) || a1->Stolen())
     return 0;
   v6 = v2 - 1;
   if ( !v6 )