Mercurial > mm7
comparison Items.cpp @ 375:c606cabd7cbf
Merge
author | Gloval |
---|---|
date | Fri, 22 Feb 2013 08:23:15 +0400 |
parents | f0f66f690777 85edec9da96b |
children | 243418228760 |
comparison
equal
deleted
inserted
replaced
374:f0f66f690777 | 375:c606cabd7cbf |
---|---|
1408 } | 1408 } |
1409 | 1409 |
1410 //----- (00456499) -------------------------------------------------------- | 1410 //----- (00456499) -------------------------------------------------------- |
1411 const char *ItemGen::GetDisplayName() | 1411 const char *ItemGen::GetDisplayName() |
1412 { | 1412 { |
1413 const char *result; // eax@2 | 1413 if (Identified()) |
1414 | 1414 return GetIdentifiedName(); |
1415 if ( this->uAttributes & ITEM_IDENTIFIED ) | |
1416 result = GetIdentifiedName(); | |
1417 else | 1415 else |
1418 result = pItemsTable->pItems[uItemID].pUnidentifiedName; | 1416 return pItemsTable->pItems[uItemID].pUnidentifiedName; |
1419 return result; | |
1420 } | 1417 } |
1421 | 1418 |
1422 //----- (004564B3) -------------------------------------------------------- | 1419 //----- (004564B3) -------------------------------------------------------- |
1423 const char *ItemGen::GetIdentifiedName() | 1420 const char *ItemGen::GetIdentifiedName() |
1424 { | 1421 { |