Mercurial > mm7

diff UI/UIShops.cpp @ 1567:9f8b3e904e14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
author Grumpy7
date Sun, 08 Sep 2013 05:22:33 +0200
parents 61458df2cb4f
children 96d567a7d15f
line wrap: on
line diff
--- a/UI/UIShops.cpp	Sun Sep 08 04:11:10 2013 +0200
+++ b/UI/UIShops.cpp	Sun Sep 08 05:22:33 2013 +0200
@@ -286,7 +286,7 @@
         || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v106.x), !pNumActiveItem) )
         return;
       v4 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1];
-      if (!v4->Identified())
+      if (!v4->IsIdentified())
       {
         v10 = pPlayer->SelectPhrasesTransaction(v4, BuildingType_WeaponShop, (int)window_SpeakInHouse->ptr_1C, 4);
         v7 = BuildDialogueString((char *)pMerchantsIdentifyPhrases[v10], uActiveCharacter - 1, v4, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
@@ -918,7 +918,7 @@
             if ( v2 )
             {
               v3 = (ItemGen *)&pPlayers[uActiveCharacter]->pInventoryItemList[v2-1];
-              if (v3->Identified())
+              if (v3->IsIdentified())
                 v5 = "%24";
               else
               {
@@ -1407,7 +1407,7 @@
          || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v109), !pNumActiveItem) )
         return;
       v37 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1];
-      if (!v37->Identified())
+      if (!v37->IsIdentified())
       {
         v42 = pPlayer->SelectPhrasesTransaction(v37, BuildingType_AlchemistShop, (int)window_SpeakInHouse->ptr_1C, 4);
         v38 = (char *)pMerchantsIdentifyPhrases[v42];