Mercurial > mm7

diff UI/UiGame.cpp @ 1832:f3b106aff057

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Mon, 07 Oct 2013 21:57:01 +0600
parents 9f93b5700e2d
children 24b70fa98474
line wrap: on
line diff
--- a/UI/UiGame.cpp	Mon Oct 07 21:56:47 2013 +0600
+++ b/UI/UiGame.cpp	Mon Oct 07 21:57:01 2013 +0600
@@ -2178,7 +2178,7 @@
         {
           uFrameID = pParty->pHirelings[(unsigned __int8)pTmpBuf[i]].evt_B;
           v13 = 0;
-          if ( (signed int)pIconsFrameTable->uNumIcons )
+          if (pIconsFrameTable->uNumIcons)
           {
             for ( v13 = 0; v13 < pIconsFrameTable->uNumIcons; ++v13 )
             {
@@ -2247,5 +2247,5 @@
     case Condition_Eradicated:
       return ui_character_condition_severe_color;
   }
-  assert(false && "Invalid condition");
+  Error("Invalid condition (%u)", uConditionIdx);
 }