diff Items.cpp @ 375:c606cabd7cbf

Merge
author Gloval
date Fri, 22 Feb 2013 08:23:15 +0400
parents f0f66f690777 85edec9da96b
children 243418228760
line wrap: on
line diff
--- a/Items.cpp	Fri Feb 22 08:20:59 2013 +0400
+++ b/Items.cpp	Fri Feb 22 08:23:15 2013 +0400
@@ -1410,13 +1410,10 @@
 //----- (00456499) --------------------------------------------------------
 const char *ItemGen::GetDisplayName()
 {
-  const char *result; // eax@2
-
-  if ( this->uAttributes & ITEM_IDENTIFIED )
-    result = GetIdentifiedName();
+  if (Identified())
+    return GetIdentifiedName();
   else
-    result = pItemsTable->pItems[uItemID].pUnidentifiedName;
-  return result;
+    return pItemsTable->pItems[uItemID].pUnidentifiedName;
 }
 
 //----- (004564B3) --------------------------------------------------------