Mercurial > mm7

diff UI/UiGame.cpp @ 1802:633f81bb3ae7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HWND -> class OSWindow
author Nomad
date Mon, 07 Oct 2013 11:52:33 +0200
parents 24e756a50073
children 9f93b5700e2d
line wrap: on
line diff
--- a/UI/UiGame.cpp	Tue Oct 01 06:19:58 2013 +0200
+++ b/UI/UiGame.cpp	Mon Oct 07 11:52:33 2013 +0200
@@ -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);
 }