Mercurial > mm7

diff UI/UIPopup.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 c4ab816fcc5e
children 43d3536a20f7 bb2378f58767
line wrap: on
line diff
--- a/UI/UIPopup.cpp	Sun Sep 08 04:11:10 2013 +0200
+++ b/UI/UIPopup.cpp	Sun Sep 08 05:22:33 2013 +0200
@@ -282,14 +282,14 @@
     if ( uActiveCharacter )
         {
         //try to identify
-        if (!inspect_item->Identified())
+        if (!inspect_item->IsIdentified())
             {
 
             v11 = inspect_item;
             if ( pPlayers[uActiveCharacter]->CanIdentify(inspect_item) == 1 )
                 inspect_item->SetIdentified();
             v83 = SPEECH_9;
-            if ( !inspect_item->Identified() )
+            if ( !inspect_item->IsIdentified() )
                 {
                 ShowStatusBarString(pGlobalTXT_LocalizationStrings[446], 2u);//"Identify Failed"
                 }
@@ -306,12 +306,12 @@
                 }
             }
         inspect_item->UpdateTempBonus(pParty->uTimePlayed);
-        if (inspect_item->Broken())
+        if (inspect_item->IsBroken())
             {
             if ( pPlayers[uActiveCharacter]->CanRepair(inspect_item) == 1 )
                 inspect_item->uAttributes = inspect_item->uAttributes & 0xFFFFFFFD | 1;
             v83 = SPEECH_11;
-            if ( !inspect_item->Broken() )
+            if ( !inspect_item->IsBroken() )
                 v83 = SPEECH_10;
             else
                 ShowStatusBarString(pGlobalTXT_LocalizationStrings[448], 2u);//"Repair Failed"
@@ -325,7 +325,7 @@
     //v13 = _this->uAttributes;
     //v14 = _this->Identified();
     //a2.y = inspect_item->Identified();
-    if (inspect_item->Broken())
+    if (inspect_item->IsBroken())
         {
         wHintWindow.DrawMessageBox(0);
         //v15 = &;
@@ -337,7 +337,7 @@
         wHintWindow.uFrameZ = wHintWindow.uFrameX + wHintWindow.uFrameWidth - 1;
         wHintWindow.uFrameW = wHintWindow.uFrameY + wHintWindow.uFrameHeight - 1;
         pRenderer->DrawTransparentRedShade(wHintWindow.uFrameX + v78, v81 + wHintWindow.uFrameY + 30, v73);
-        if ( inspect_item->Identified())
+        if ( inspect_item->IsIdentified())
             v16 = inspect_item->GetIdentifiedName();
         else
             v16 = item_desc->pUnidentifiedName;
@@ -354,7 +354,7 @@
             }
         return;
         }
-    if (!inspect_item->Identified())
+    if (!inspect_item->IsIdentified())
         {
         wHintWindow.DrawMessageBox(0);
         pRenderer->SetTextureClipRect(wHintWindow.uFrameX + 12,  wHintWindow.uFrameY + 12,