Mercurial > mm7

changeset 499:511e3a6f587a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Thu, 28 Feb 2013 10:34:14 +0600
parents 89e360b3a0fd
children 63b171359be2
files mm7_1.cpp
diffstat 1 files changed, 11 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_1.cpp	Wed Feb 27 09:26:16 2013 +0600
+++ b/mm7_1.cpp	Thu Feb 28 10:34:14 2013 +0600
@@ -2926,17 +2926,9 @@
       v116 = v106.uViewportZ;
     if ( v119 > (signed int)v106.uViewportW )
       v119 = v106.uViewportW;
-    pRenderer->FillRectFast(
-      v106.uViewportX,
-      v106.uViewportY,
-      v106.uViewportZ - v106.uViewportX,
-      v106.uViewportW - v106.uViewportY,
+    pRenderer->FillRectFast(v106.uViewportX, v106.uViewportY, v106.uViewportZ - v106.uViewportX, v106.uViewportW - v106.uViewportY,
       pRenderer->uTargetBMask | pRenderer->uTargetGMask);
-    pRenderer->FillRectFast(
-      v106.uViewportX,
-      v106.uViewportY,
-      v106.uViewportZ - v106.uViewportX,
-      v106.uViewportW - v106.uViewportY,
+    pRenderer->FillRectFast(v106.uViewportX, v106.uViewportY, v106.uViewportZ - v106.uViewportX, v106.uViewportW - v106.uViewportY,
       pRenderer->uTargetBMask | pRenderer->uTargetGMask);
     v84.left = v106.uViewportX;
     v84.top = v106.uViewportY;
@@ -3020,9 +3012,7 @@
 				{
 				  v110 = (LPVOID)((pDesc.lPitch >> 1) * pDesc.dwHeight * v111 / v13->uAreaHeight);
 				  v33 = v108[(int)((char *)v110 + pDesc.dwWidth * (v32 + v124) / v13->uAreaWidth)];
-				  v34 = v33 & 0x1F | 2
-								   * (unsigned __int16)(v108[(int)((char *)v110
-																	+ pDesc.dwWidth * (v32 + v124++) / v13->uAreaWidth)] & 0xFFE0);
+				  v34 = v33 & 0x1F | 2 * (unsigned __int16)(v108[(int)((char *)v110 + pDesc.dwWidth * (v32 + v124++) / v13->uAreaWidth)] & 0xFFE0);
 				  v35 = v124;
 				  *(short *)v30 = v34;
 				  v30 += 2;
@@ -3045,12 +3035,7 @@
   }
   else
   {
-    pRenderer->FillRectFast(
-      v106.uViewportX,
-      v106.uViewportY,
-      v106.uViewportZ - v106.uViewportX,
-      v106.uViewportW - v106.uViewportY,
-      0);
+    pRenderer->FillRectFast(v106.uViewportX, v106.uViewportY, v106.uViewportZ - v106.uViewportX, v106.uViewportW - v106.uViewportY, 0);
     v36 = v10->pHwSpriteIDs[0];
     if ( v36 >= 0 )
       pSprites_LOD->pSpriteHeaders[v36]._4ACC38(&v106, 0);
@@ -3097,7 +3082,7 @@
 	  LOBYTE(v40) = pPlayers[uActiveCharacter]->GetActualSkillLevel(PLAYER_SKILL_MONSTER_ID);
 	  v120 = v40;
 	  if ( !v40 )
-					v45 = 1;
+		v45 = 1;
 	  else
 	  {
 		  v41 = (unsigned __int8)v40 & 0x3F;
@@ -3110,7 +3095,7 @@
 			  v119 = 1;
 			}
 			else
-						v45 = 1;
+				v45 = 1;
 		  }
 		  else
 		  {
@@ -3374,22 +3359,11 @@
     a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
     v57 = v121->pMonsterInfo.uAttack1DamageBonus;
     if ( v57 )
-      sprintf(
-        pTmpBuf,
-        "%s\f%05u\t080%dd%d+%d\n",
-        pGlobalTXT_LocalizationStrings[53],
-        0,
-        v121->pMonsterInfo.uAttack1DamageDiceRolls,
-        v121->pMonsterInfo.uAttack1DamageDiceSides,
-        v57);
+      sprintf(pTmpBuf, "%s\f%05u\t080%dd%d+%d\n", pGlobalTXT_LocalizationStrings[53],
+        0, v121->pMonsterInfo.uAttack1DamageDiceRolls, v121->pMonsterInfo.uAttack1DamageDiceSides, v57);
     else
-      sprintf(
-        pTmpBuf,
-        "%s\f%05u\t080%dd%d\n",
-        pGlobalTXT_LocalizationStrings[53],
-        0,
-        v121->pMonsterInfo.uAttack1DamageDiceRolls,
-        v121->pMonsterInfo.uAttack1DamageDiceSides);
+      sprintf(pTmpBuf, "%s\f%05u\t080%dd%d\n", pGlobalTXT_LocalizationStrings[53],
+        0, v121->pMonsterInfo.uAttack1DamageDiceRolls, v121->pMonsterInfo.uAttack1DamageDiceSides);
   }
   else
   {
@@ -3510,13 +3484,7 @@
   {
     sprintf(pTmpBuf, "%s: %d", pGlobalTXT_LocalizationStrings[650], v121->sCurrentHP);
     pFontSmallnum->GetLineWidth(pTmpBuf);
-    result = a1->DrawTitleText(
-               pFontSmallnum,
-               0,
-               a1->uFrameHeight - LOBYTE(pFontSmallnum->uFontHeight) - 12,
-               0,
-               pTmpBuf,
-               3u);
+    result = a1->DrawTitleText(pFontSmallnum, 0, a1->uFrameHeight - LOBYTE(pFontSmallnum->uFontHeight) - 12, 0, pTmpBuf, 3);
   }
   return result;
 }