# HG changeset patch
# User Ritor1
# Date 1353468409 -21600
# Node ID 96ab6bba84082e5eb4bae4d5fe5e178c79b528ee
# Parent  1d44b914b7bd833b52fa05ca06efecc66479f0ab# Parent  9433939584e2300243722713fc03da8ead3d01c4
Слияние

diff -r 9433939584e2 -r 96ab6bba8408 Party.cpp
diff -r 9433939584e2 -r 96ab6bba8408 Render.cpp
--- a/Render.cpp	Tue Nov 20 23:38:54 2012 +0200
+++ b/Render.cpp	Wed Nov 21 09:26:49 2012 +0600
@@ -1838,8 +1838,8 @@
       v5 = abs(X);
       v6 = abs(v83);
       --X;
-      v93 = &stru_76E5C8[(v5 << 7) + v6];
-      if ( !v93->field_0 || ((v7 = 48 * v4, v8 = &pVerticesSR_806210[v4], a2 = v8, !v82) ? (v9 = (RenderVertexSoft *)((char *)&pVerticesSR_801A10 + v7),
+      v93 =  &stru_76E5C8[(v5 << 7) + v6];
+	  if ( !v93->field_0 || ((v7 = 48 * v4, v8 = &pVerticesSR_806210[v4], a2 = v8, !v82) ? (v9 = (RenderVertexSoft *)((char *)&pVerticesSR_801A10 + v7),
                                                                       v10 = &pVerticesSR_806210[1] + v7) : (v9 = &pVerticesSR_806210[1] + v7, v10 = (RenderVertexSoft *)((char *)&pVerticesSR_801A10 + v7)),
             ((a8 = v9,
               pVertices = &pVerticesSR_801A10[1] + v7,
@@ -4640,7 +4640,7 @@
 
   memset(&v3, 0, sizeof(DDBLTFX));
   if (pVersion->pVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT ||
-      pVersion->pVersionInfo.dwMajorVersion >= 5)
+      pVersion->pVersionInfo.dwMajorVersion != 4)
   {
     x.left = uWindowX;
     x.right = uWindowX + uWindowHeight;