Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
1760:a2ea57410b15 1802:633f81bb3ae7
2176 pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE))); 2176 pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE)));
2177 if ( pParty->pHirelings[(unsigned __int8)pTmpBuf[i]].evt_A == 1 ) 2177 if ( pParty->pHirelings[(unsigned __int8)pTmpBuf[i]].evt_A == 1 )
2178 { 2178 {
2179 uFrameID = pParty->pHirelings[(unsigned __int8)pTmpBuf[i]].evt_B; 2179 uFrameID = pParty->pHirelings[(unsigned __int8)pTmpBuf[i]].evt_B;
2180 v13 = 0; 2180 v13 = 0;
2181 if ( (signed int)pIconsFrameTable->uNumIcons ) 2181 if (pIconsFrameTable->uNumIcons)
2182 { 2182 {
2183 for ( v13 = 0; v13 < pIconsFrameTable->uNumIcons; ++v13 ) 2183 for ( v13 = 0; v13 < pIconsFrameTable->uNumIcons; ++v13 )
2184 { 2184 {
2185 if ( !_stricmp("spell96", pIconsFrameTable->pIcons[v13].pAnimationName) ) 2185 if ( !_stricmp("spell96", pIconsFrameTable->pIcons[v13].pAnimationName) )
2186 break; 2186 break;
2245 case Condition_Dead: 2245 case Condition_Dead:
2246 case Condition_Pertified: 2246 case Condition_Pertified:
2247 case Condition_Eradicated: 2247 case Condition_Eradicated:
2248 return ui_character_condition_severe_color; 2248 return ui_character_condition_severe_color;
2249 } 2249 }
2250 assert(false && "Invalid condition"); 2250 Error("Invalid condition (%u)", uConditionIdx);
2251 } 2251 }