Mercurial > mm7

diff mm7_4.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 9a6567c6c76c
children d3d539924e5e 75fafd8ced59 a52a01aaf439
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Sep 08 04:11:10 2013 +0200
+++ b/mm7_4.cpp	Sun Sep 08 05:22:33 2013 +0200
@@ -2055,7 +2055,7 @@
             if ( a5 == 3 )
             {
               v29 = pPlayer->GetPriceSell(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
-              if (a3->Broken())
+              if (a3->IsBroken())
                 v29 = 1;
               sprintfex(a1, "%lu", v29);
               strcat(pTmpBuf2.data(), a1);
@@ -2072,7 +2072,7 @@
                 if ( a5 == 6 )
                 {
                   v29 = pPlayer->GetPriceSell(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier) / 2;
-                  if (a3->Broken())
+                  if (a3->IsBroken())
                     v29 = 1;
                   if (!v29)
                     v29 = 1;
@@ -3658,7 +3658,7 @@
   bool test;
 
   if ( (p2DEvents[_2da_idx - 1].uType != 4 || (signed int)item->uItemID < 740 || (signed int)item->uItemID > 771)
-    && ((signed int)item->uItemID >= 600 || (signed int)item->uItemID >= 529 && (signed int)item->uItemID <= 599) || item->Stolen())
+    && ((signed int)item->uItemID >= 600 || (signed int)item->uItemID >= 529 && (signed int)item->uItemID <= 599) || item->IsStolen())
     return 0;
   switch( p2DEvents[_2da_idx - 1].uType )
   {