Mercurial > mm7

diff Items.cpp @ 366:85edec9da96b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
_4B910F_shop_interaction
author Nomad
date Fri, 22 Feb 2013 01:36:54 +0200
parents 0f35f908547f
children c606cabd7cbf
line wrap: on
line diff
--- a/Items.cpp	Fri Feb 22 01:20:30 2013 +0400
+++ b/Items.cpp	Fri Feb 22 01:36:54 2013 +0200
@@ -1417,13 +1417,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) --------------------------------------------------------