mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-06 05:07:48 +02:00
Code Issues Releases Wiki Activity

#368 check floorIndex before heavy getTriggerFloorCeiling call

Browse Source
This commit is contained in:
XProger
2022-02-12 12:08:46 +03:00
parent 6a70ec64b2
commit fe75116d5b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/fixed/room.h
View File

@@ -49,9 +49,9 @@ int32 Sector::getFloor(int32 x, int32 y, int32 z) const
floor -= sx * (sx < 0 ? dx : (dx - 1023)) >> 2; floor -= sx * (sx < 0 ? dx : (dx - 1023)) >> 2;
floor -= sz * (sz < 0 ? dz : (dz - 1023)) >> 2; floor -= sz * (sz < 0 ? dz : (dz - 1023)) >> 2;
} }
}
lowerSector->getTriggerFloorCeiling(x, y, z, &floor, NULL); lowerSector->getTriggerFloorCeiling(x, y, z, &floor, NULL);
}
return floor; return floor;
} }
@@ -86,7 +86,10 @@ int32 Sector::getCeiling(int32 x, int32 y, int32 z) const
const Sector* lowerSector = getSectorBelow(x, z); const Sector* lowerSector = getSectorBelow(x, z);
lowerSector->getTriggerFloorCeiling(x, y, z, NULL, &ceiling); if (lowerSector->floorIndex)
{
lowerSector->getTriggerFloorCeiling(x, y, z, NULL, &ceiling);
}
return ceiling; return ceiling;
} }