# HG changeset patch
# User Ritor1
# Date 1358778130 -21600
# Node ID 8af333180755f7190c0ccd63cb771524d651f319
# Parent  7082a3f95e7ca6183a5d996e7c2e4ff264262edc# Parent  5629105aa1781d02a1b6e85140abb8abd5fe7c26
Слияние

diff -r 5629105aa178 -r 8af333180755 Render.cpp
diff -r 5629105aa178 -r 8af333180755 mm7_4.cpp
--- a/mm7_4.cpp	Mon Jan 21 14:37:14 2013 +0600
+++ b/mm7_4.cpp	Mon Jan 21 20:22:10 2013 +0600
@@ -3245,7 +3245,7 @@
     if (pPlayer->field_1AA2 != pFrame->uTextureID - 1 || v22 )
     {
       pPlayer->field_1AA2 = pFrame->uTextureID - 1;
-      pFace = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];
+      pFace = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];//pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID];
       pPortrait = pFace;
       v9 = pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i];
       if ( pParty->pPartyBuffs[11].uExpireTime )
diff -r 5629105aa178 -r 8af333180755 mm7_5.cpp