Mercurial > mm7

diff SpriteObject.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 d5473972234d
children d170f23f70d1
line wrap: on
line diff
--- a/SpriteObject.cpp	Wed Mar 20 17:49:15 2013 +0600
+++ b/SpriteObject.cpp	Thu Mar 21 16:09:44 2013 +0600
@@ -240,7 +240,7 @@
   v4 = v1->vPosition.x;
   v5 = v2->uHeight;
   v55 = 0;
-  v6 = sub_46D49E_prolly_get_world_y_under_party(v4, v3, v1->vPosition.z, v5, &v59, &v55, 0);
+  v6 = ODM_GetFloorLevel(v4, v3, v1->vPosition.z, v5, &v59, &v55, 0);
   v7 = v6;
   v54 = v6;
   v8 = v6 + 1;
@@ -428,7 +428,7 @@
           _46DF1A_collide_against_actor(i, 0);
       }
       v26 = stru_721530.normal2.z - stru_721530.prolly_normal_d - 1;
-      v27 = sub_46D49E_prolly_get_world_y_under_party(
+      v27 = ODM_GetFloorLevel(
               stru_721530.normal2.x,
               stru_721530.normal2.y,
               stru_721530.normal2.z - stru_721530.prolly_normal_d - 1,
@@ -644,7 +644,7 @@
   //v3 = pSpriteObject->vPosition.x;
   //v37 = &pObjectList->pObjects[pSpriteObject->uObjectDescID];
   pSpriteObject->uSectorID = pIndoor->GetSector(pSpriteObject->vPosition.x, pSpriteObject->vPosition.y, pSpriteObject->vPosition.z);
-  v42 = _46CEC3_get_floor_level(pSpriteObject->vPosition.x, pSpriteObject->vPosition.y, pSpriteObject->vPosition.z, pSpriteObject->uSectorID, &uFaceID);
+  v42 = BLV_GetFloorLevel(pSpriteObject->vPosition.x, pSpriteObject->vPosition.y, pSpriteObject->vPosition.z, pSpriteObject->uSectorID, &uFaceID);
   if ( abs(pSpriteObject->vPosition.x) > 32767
     || abs(pSpriteObject->vPosition.y) > 32767
     || abs(pSpriteObject->vPosition.z) > 20000