Mercurial > mm7

diff mm7_4.cpp @ 101:2fb33d31ca0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8.02.13
author Ritor1
date Fri, 08 Feb 2013 15:59:32 +0600
parents d61f6bc04bf2
children 8a10c9780e17
line wrap: on
line diff
--- a/mm7_4.cpp	Thu Feb 07 15:25:44 2013 +0600
+++ b/mm7_4.cpp	Fri Feb 08 15:59:32 2013 +0600
@@ -3110,25 +3110,21 @@
     v6 = (unsigned __int8)pParty->field_709;
     for ( i = (unsigned __int8)pParty->field_709; i < v22; v6 = i++ + 1 )
     {
-      if ( v23 >= 2u )
+      if ( v23 >= 2 )
         break;
       v7 = pTmpBuf[v6];
-      if ( (unsigned __int8)v7 >= 2u )
+      if ( (unsigned __int8)v7 >= 2 )
       {
         sprintf(pContainer, "NPC%03d", pNPCStats->pNPCData[(unsigned __int8)v7 + 499].uPortraitID);
         v15 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
-        pRenderer->DrawTextureIndexed(pHiredNPCsIconsOffsetsX[v23], pHiredNPCsIconsOffsetsY[v23],
-          (Texture *)(v15 != -1 ? &pIcons_LOD->pTextures[v15] : 0));
+        pRenderer->DrawTextureIndexed(pHiredNPCsIconsOffsetsX[v23], pHiredNPCsIconsOffsetsY[v23], (Texture *)(v15 != -1 ? &pIcons_LOD->pTextures[v15] : 0));
       }
       else
       {
         sprintf(pContainer, "NPC%03d", pParty->pHirelings[(unsigned __int8)v7].uPortraitID);
         v8 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
         v9 = v23;
-        pRenderer->DrawTextureIndexed(
-          pHiredNPCsIconsOffsetsX[v9],
-          pHiredNPCsIconsOffsetsY[v9],
-          (Texture *)(v8 != -1 ? &pIcons_LOD->pTextures[v8] : 0));
+        pRenderer->DrawTextureIndexed(pHiredNPCsIconsOffsetsX[v9], pHiredNPCsIconsOffsetsY[v9], (Texture *)(v8 != -1 ? &pIcons_LOD->pTextures[v8] : 0));
         v10 = (unsigned __int8)pTmpBuf[i];
         if ( pParty->pHirelings[v10].bDrawSomeAnim == 1 )
         {