# HG changeset patch
# User Ritor1
# Date 1358441943 -21600
# Node ID 980c34defdab8b1ff276a842afedba6acdae0c90
# Parent  2127707df23fc21941dd6f53c491caefdbf0dfd9# Parent  d5954a85577af088f80c4886c4fc8379ddde1451
Слияние

diff -r d5954a85577a -r 980c34defdab mm7_5.cpp
--- a/mm7_5.cpp	Thu Jan 17 17:56:08 2013 +0600
+++ b/mm7_5.cpp	Thu Jan 17 22:59:03 2013 +0600
@@ -8644,17 +8644,11 @@
   v47 = pPlayers[uPlayerID];
   pIcons_LOD->LoadTexture("sptext01", TEXTURE_16BIT_PALETTE);
   CharacterUI_DrawPaperdoll(v1);
-  pRenderer->DrawTextureTransparent(
-    0x1D9u,
-    0,
+  pRenderer->DrawTextureTransparent(0x1D9u, 0,
     (Texture *)(uTextureID_BACKHAND != -1 ? &pIcons_LOD->pTextures[uTextureID_BACKHAND] : 0));
-  pRenderer->DrawTextureTransparent(
-    0x1D4u,
-    0,
+  pRenderer->DrawTextureTransparent(0x1D4u, 0,
     (Texture *)(uTextureID_507B04 != -1 ? &pIcons_LOD->pTextures[uTextureID_507B04] : 0));
-  pRenderer->DrawTextureIndexed(
-    pCharacterScreen_DetalizBtn->uX,
-    pCharacterScreen_DetalizBtn->uY,
+  pRenderer->DrawTextureIndexed(pCharacterScreen_DetalizBtn->uX, pCharacterScreen_DetalizBtn->uY,
     (Texture *)(uTextureID_5118C8 != -1 ? &pIcons_LOD->pTextures[uTextureID_5118C8] : 0));
   v3 = 0;
   v46 = (int)&pPlayer->pEquipment.field_28;
@@ -8695,14 +8689,8 @@
                 ptr_50C9A4 = 0;
               }
               v8 = (double)GetTickCount() * 0.1;
-              pRenderer->_4A63E6(
-                a2,
-                a3,
-                (Texture *)(v5 != -1 ? (int)&pIcons_LOD->pTextures[v5] : 0),
-                v40,
-                (signed __int64)v8,
-                0,
-                255);
+              pRenderer->_4A63E6(a2, a3, (Texture *)(v5 != -1 ? (int)&pIcons_LOD->pTextures[v5] : 0),
+                v40, (signed __int64)v8, 0, 255);
               goto LABEL_23;
             }
 LABEL_13:
@@ -8900,14 +8888,8 @@
     ptr_50C9A4 = 0;
   }
   v32 = (double)GetTickCount() * 0.1;
-  pRenderer->_4A63E6(
-    0x24Au,
-    0x58u,
-    (Texture *)(v28 != -1 ? (int)&pIcons_LOD->pTextures[v28] : 0),
-    v31,
-    (signed __int64)v32,
-    0,
-    255);
+  pRenderer->_4A63E6(0x24Au, 0x58u, (Texture *)(v28 != -1 ? (int)&pIcons_LOD->pTextures[v28] : 0),
+    v31, (signed __int64)v32, 0, 255);
 }