diff Render.cpp @ 1288:7adc8b9b6a25

Слияние
author Ritor1
date Mon, 10 Jun 2013 09:30:21 +0600
parents 96a81634669e
children 0aeac0b9ca30
line wrap: on
line diff
--- a/Render.cpp	Mon Jun 10 09:30:12 2013 +0600
+++ b/Render.cpp	Mon Jun 10 09:30:21 2013 +0600
@@ -267,7 +267,7 @@
   v0 = pRenderer->pTargetSurface;
   v1 = pOutdoorCamera->numStru148s;
   a1 = pRenderer->pTargetSurface;
-  v2 = array_77EC08;
+  v2 = array_77EC08.data();
   v37 = pOutdoorCamera->numStru148s;
   if ( !(pParty->uFlags & 2) )
   {
@@ -1134,7 +1134,7 @@
       if ( v120 > terrain_76DFC8[v17] )
       {
         v125 = v120;
-        memset32(terrain_76D9C8, v119 + 1, 4 * (v120 - terrain_76DFC8[v17] + 1));
+        memset32(terrain_76D9C8.data(), v119 + 1, 4 * (v120 - terrain_76DFC8[v17] + 1));
         v19 = v120;
         do
           terrain_76DBC8[v126++] = v19--;
@@ -1182,7 +1182,7 @@
       if ( v120 > terrain_76E3C8[v18] )
       {
         v125 = v120;
-        memset32(terrain_76D5C8, v122, 4 * (v120 - terrain_76E3C8[v18] + 1));
+        memset32(terrain_76D5C8.data(), v122, 4 * (v120 - terrain_76E3C8[v18] + 1));
         do
         {
           v25 = v126;
@@ -1235,7 +1235,7 @@
       if ( v122 < terrain_76DDC8[v17] )
       {
         v106 = v122;
-        memset32(terrain_76DBC8, v120 + 1, 4 * (terrain_76DDC8[v17] - v122 + 1));
+        memset32(terrain_76DBC8.data(), v120 + 1, 4 * (terrain_76DDC8[v17] - v122 + 1));
         for ( v32 = v122; v32 <= terrain_76DDC8[v17]; v32++)
           terrain_76D9C8[v126++] = v32;
         if ( terrain_76DDC8[v17] == terrain_76DBC8[v17 -1] )
@@ -1280,7 +1280,7 @@
       if ( v122 < v37 )
       {
         v114 = v122;
-        memset32(terrain_76D7C8, i, 4 * (v37 - v122 + 1));
+        memset32(terrain_76D7C8.data(), i, 4 * (v37 - v122 + 1));
         do
         {
           v38 = v126;
@@ -1332,7 +1332,7 @@
       if ( v119 > terrain_76DDC8[v17] )
       {
         v106 = v119;
-        memset32(terrain_76DBC8, i, 4 * (v119 - terrain_76DDC8[v17] + 1));
+        memset32(terrain_76DBC8.data(), i, 4 * (v119 - terrain_76DDC8[v17] + 1));
         for ( v45 = v119; v45 >= terrain_76DDC8[v17]; v45--)
           terrain_76D9C8[v126++] = v45;
         if ( terrain_76DDC8[v17] == terrain_76DBC8[v17 -1] )
@@ -1377,7 +1377,7 @@
       if ( v119 > v49 )
       {
         v125 = v119;
-        memset32(terrain_76D7C8, v120 + 1, 4 * (v119 - v49 + 1));
+        memset32(terrain_76D7C8.data(), v120 + 1, 4 * (v119 - v49 + 1));
         do
         {
           v50 = v126;
@@ -1429,7 +1429,7 @@
       if ( i < terrain_76DFC8[v17] )
       {
         v106 = i;
-        memset32(terrain_76D9C8, v122, 4 * (terrain_76DFC8[v17] - i + 1));
+        memset32(terrain_76D9C8.data(), v122, 4 * (terrain_76DFC8[v17] - i + 1));
         v56 = i;
         do
         {
@@ -1480,7 +1480,7 @@
       if ( i < v62 )
       {
         v114 = i;
-        memset32(terrain_76D5C8, v119 + 1, 4 * (v62 - i + 1));
+        memset32(terrain_76D5C8.data(), v119 + 1, 4 * (v62 - i + 1));
         do
         {
           v63 = v126;
@@ -2831,7 +2831,7 @@
           v17->field_34 = v58->distance;
           v17->terrain_grid_z = v94;
           v17->terrain_grid_x = LOBYTE(v99);
-          v59 = *(unsigned __int16 *)((char *)pTerrainNormalIndices + LODWORD(v93));
+          v59 = *(unsigned __int16 *)((char *)pTerrainNormalIndices.data() + LODWORD(v93));
           if ( v59 > (signed int)(uNumTerrainNormals - 1) )
           {
             pNormalb = 0;
@@ -3079,7 +3079,7 @@
   //v41 = 0;
   for (int i = 0; i < uNumSpriteObjects; ++i)
   {
-    auto object = pSpriteObjects + i;
+    auto object = &pSpriteObjects[i];
     //auto v0 = (char *)&pSpriteObjects[i].uSectorID;
     //v0 = (char *)&pSpriteObjects[0].uSectorID;
     //do
@@ -3500,7 +3500,7 @@
     //do
   for (int i = 0; i < uNumLevelDecorations; ++i)
   {
-    auto decor = pLevelDecorations + i;
+    auto decor = &pLevelDecorations[i];
     auto v0 = (char *)&pLevelDecorations[i].vPosition.y;
 
       if ( (!(decor->field_2 & 0x40) || decor->_47A825()) && !(decor->field_2 & 0x20) )
@@ -8975,7 +8975,7 @@
     LODWORD(v40) = (int)v14;
 
     int __i = 0;
-    v15 = dword_F1B430;
+    v15 = dword_F1B430.data();
     do
     {
       v16 = v3;