Mercurial > mm7

diff mm7_2.cpp @ 723:256211e8243a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ODM_GetFloorLevel & BLV_GetFloorLevel
author Ritor1
date Thu, 21 Mar 2013 16:09:44 +0600
parents 70c5a87a1307
children 737d7fec67f0
line wrap: on
line diff
--- a/mm7_2.cpp	Wed Mar 20 17:49:15 2013 +0600
+++ b/mm7_2.cpp	Thu Mar 21 16:09:44 2013 +0600
@@ -5106,7 +5106,7 @@
       v37 = pIndoor->GetSector(pPosX, a4, v36);
       if ( v37 == pSector )
       {
-        v38 = _46CEC3_get_floor_level(pPosX, a4, a3, v37, &uFaceID);
+        v38 = BLV_GetFloorLevel(pPosX, a4, a3, v37, &uFaceID);
         v39 = v38;
         if ( v38 != -30000 )
         {
@@ -5237,7 +5237,7 @@
       || (v22 = pParty->vPosition.z,
           result = pIndoor->GetSector(v11, v14, pParty->vPosition.z),
           result == v21)
-      && (result = _46CEC3_get_floor_level(v11, v14, v22, result, &uFaceID), result != -30000)
+      && (result = BLV_GetFloorLevel(v11, v14, v22, result, &uFaceID), result != -30000)
       && (result = abs(result - v22), result <= 1024) )
     {
       if ( v20 == uNumActors )
@@ -5549,7 +5549,7 @@
       v19.vPosition.z = pParty->vPosition.z;
       v26 = 0;
       v27 = 0;
-      v19.vPosition.z = sub_46D49E_prolly_get_world_y_under_party(
+      v19.vPosition.z = ODM_GetFloorLevel(
                           v19.vPosition.x,
                           v23 + pParty->vPosition.y,
                           pParty->vPosition.z,
@@ -5607,7 +5607,7 @@
       v17 = pIndoor->GetSector(v19.vPosition.x, v23 + pParty->vPosition.y, pParty->vPosition.z);
       if ( v17 == v22 )
       {
-        v18 = _46CEC3_get_floor_level(v19.vPosition.x, v19.vPosition.y, v19.vPosition.z, v17, &uFaceID);
+        v18 = BLV_GetFloorLevel(v19.vPosition.x, v19.vPosition.y, v19.vPosition.z, v17, &uFaceID);
         v19.vPosition.z = v18;
         if ( v18 != -30000 )
         {