From 86e75f09875906ee7b0d4d4e300d6bf79827758f Mon Sep 17 00:00:00 2001 From: scrawl Date: Thu, 9 Mar 2017 21:45:38 +0100 Subject: [PATCH] Preload terrain even when cell preloading is disabled --- apps/openmw/mwworld/scene.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index a772abdc2..437753f95 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -209,14 +209,11 @@ namespace MWWorld void Scene::update (float duration, bool paused) { - if (mPreloadEnabled) + mPreloadTimer += duration; + if (mPreloadTimer > 0.1f) { - mPreloadTimer += duration; - if (mPreloadTimer > 0.1f) - { - preloadCells(0.1f); - mPreloadTimer = 0.f; - } + preloadCells(0.1f); + mPreloadTimer = 0.f; } mRendering.update (duration, paused); @@ -704,12 +701,15 @@ namespace MWWorld mLastPlayerPos = playerPos; - if (mPreloadDoors) - preloadTeleportDoorDestinations(playerPos, predictedPos, exteriorPositions); - if (mPreloadExteriorGrid) - preloadExteriorGrid(playerPos, predictedPos); - if (mPreloadFastTravel) - preloadFastTravelDestinations(playerPos, predictedPos); + if (mPreloadEnabled) + { + if (mPreloadDoors) + preloadTeleportDoorDestinations(playerPos, predictedPos, exteriorPositions); + if (mPreloadExteriorGrid) + preloadExteriorGrid(playerPos, predictedPos); + if (mPreloadFastTravel) + preloadFastTravelDestinations(playerPos, predictedPos); + } mPreloader->setTerrainPreloadPositions(exteriorPositions); }