Mercurial > mm7

diff Game.cpp @ 831:9c3f28b31b4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Party actions in blv
author Nomad
date Wed, 27 Mar 2013 15:04:59 +0200
parents cfc65feef029
children e398541aee60 710cf848ad24
line wrap: on
line diff
--- a/Game.cpp	Wed Mar 27 11:59:37 2013 +0200
+++ b/Game.cpp	Wed Mar 27 15:04:59 2013 +0200
@@ -204,7 +204,8 @@
 
   if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
   {
-    sprintf(pTmpBuf, "Party Sector ID:        %u/%u\n", pBLVRenderParams->uPartySectorID, pIndoor->uNumSectors);
+    auto sector_id = pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
+    sprintf(pTmpBuf, "Party Sector ID:        %u/%u\n", sector_id, pIndoor->uNumSectors);
     pPrimaryWindow->DrawText(pFontArrus, 16, 16, GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(255, 255, 255), pTmpBuf, 0, 0, 0xFFFFFFFF);
   }
   sprintf(pTmpBuf, "Party Position:         % d % d % d", pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
@@ -213,7 +214,8 @@
   if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
   {
     uint uFaceID;
-    auto floor_level = BLV_GetFloorLevel(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z, pBLVRenderParams->uPartySectorID, &uFaceID);
+    auto sector_id = pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
+    auto floor_level = BLV_GetFloorLevel(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z + 40, sector_id, &uFaceID);
     sprintf(pTmpBuf, "BLV_GetFloorLevel: %d   face_id %d\n", floor_level, uFaceID);
   }
   else