# HG changeset patch
# User Ritor1
# Date 1361985857 -21600
# Node ID 00ce82758c72526f5eab2e0c4da06bdd4be1bf58
# Parent  542ea7a55b1733cf384088cf12bc11ebfa637bc5# Parent  b6bdfaa3ae0f836bdcd9a396ec3b7b9f15e4b7c5
Слияние

diff -r b6bdfaa3ae0f -r 00ce82758c72 Player.cpp
diff -r b6bdfaa3ae0f -r 00ce82758c72 mm7_1.cpp
--- a/mm7_1.cpp	Wed Feb 27 02:26:16 2013 +0400
+++ b/mm7_1.cpp	Wed Feb 27 23:24:17 2013 +0600
@@ -3045,12 +3045,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);
diff -r b6bdfaa3ae0f -r 00ce82758c72 mm7_4.cpp
--- a/mm7_4.cpp	Wed Feb 27 02:26:16 2013 +0400
+++ b/mm7_4.cpp	Wed Feb 27 23:24:17 2013 +0600
@@ -9370,6 +9370,7 @@
 	  v9->uHolderPlayer = v5;
   }
 }
+
 // 4F08EC: using guessed type int dword_4F08EC[];
 // 722B3C: using guessed type int dword_722B3C;
 // 722B44: using guessed type int dword_722B44;