diff mm7_1.cpp @ 182:6416ded80dcf

Слияние
author Ritor1
date Thu, 14 Feb 2013 22:38:54 +0600
parents d1dde383af89
children 91fa025e6ca6
line wrap: on
line diff
--- a/mm7_1.cpp	Thu Feb 14 22:38:44 2013 +0600
+++ b/mm7_1.cpp	Thu Feb 14 22:38:54 2013 +0600
@@ -3062,7 +3062,7 @@
     {
       memset(&pDesc, 0, 0x7Cu);
       pDesc.dwSize = 124;
-      if ( !pRenderer->LockSurface_DDraw4((IDirectDrawSurface4 *)v222, &pDesc, 1u) )
+      if ( !pRenderer->LockSurface_DDraw4((IDirectDrawSurface4 *)v222, &pDesc, DDLOCK_WAIT))
         goto LABEL_51;
       v20 = (char *)v124;
       v110 = pDesc.lpSurface;
@@ -3109,7 +3109,7 @@
     }
     memset(&pDesc, 0, 0x7Cu);
     pDesc.dwSize = 124;
-    if ( pRenderer->LockSurface_DDraw4((IDirectDrawSurface4 *)v222, &pDesc, 1u) )
+    if ( pRenderer->LockSurface_DDraw4((IDirectDrawSurface4 *)v222, &pDesc, DDLOCK_WAIT) )
     {
       v108 = (unsigned __int16 *)pDesc.lpSurface;
       a2 = (Player *)v124;
@@ -7740,7 +7740,7 @@
   v3 = (char *)&array_507D30[0].vWorldViewPosition.z;
   v4 = (char *)&array_507D30[0].vWorldViewPosition.y;
   v5 = v1;
-  v23 = (char *)&array_507D30[0].flt_20;
+  v23 = (char *)&array_507D30[0]._rhw;
   v21 = array_507D30;
   v18 = (char *)&array_507D30[0].vWorldViewPosition.z;
   v19 = (char *)&array_507D30[0].vWorldViewPosition.y;