Mercurial > might-and-magic-trilogy

diff mm7_3.cpp @ 125:b90504bbb93b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Fri, 16 Nov 2012 13:58:59 +0200
parents acf7f12714a7 05b2d9653abc
children 062e8a8e09bc
line wrap: on
line diff
--- a/mm7_3.cpp	Fri Nov 16 13:56:53 2012 +0200
+++ b/mm7_3.cpp	Fri Nov 16 13:58:59 2012 +0200
@@ -7854,7 +7854,7 @@
       HIDWORD(v36) = v19->uTextureHeight;
       v22 = (double)SHIDWORD(v36);
       HIDWORD(v36) = v18 >> 16;
-      v24 = __OFSUB__(v31, _this.uNumVertices);
+      v24 = _this.uNumVertices > v31;
       v23 = ((v31 - _this.uNumVertices) & 0x80000000u) != 0;
       *((float *)v7 - 9) = v21 / (v22 * 65536.0);
       *((float *)v7 - 16) = (double)pOutdoorCamera->shading_dist_mist;
@@ -18701,7 +18701,7 @@
   if ( v10 )
   {
     v11 = uNumActors;
-    SpawnEncounter((MapInfo *)&pMapStats + v10, &v16, 0, count, 0);
+    SpawnEncounter((MapInfo *)&pMapStats->pInfos[v10], &v16, 0, count, 0);
     memcpy(&v15, Actor::GetDirectionInfo(8 * v11 | AI_OBJECT_ACTOR, 4u, &a3, 1), sizeof(v15));
     v12 = v11;
     if ( (signed int)v11 < (signed int)uNumActors )