From dc05e9adbbda2b56f4d28179fc8ea23b33062773 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 18 Aug 2023 19:01:45 +0200
Subject: [PATCH] Avoid redundant check for nullptr

---
 apps/openmw/mwrender/landmanager.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/landmanager.cpp b/apps/openmw/mwrender/landmanager.cpp
index cda1954421..63ced5d12c 100644
--- a/apps/openmw/mwrender/landmanager.cpp
+++ b/apps/openmw/mwrender/landmanager.cpp
@@ -24,13 +24,11 @@ namespace MWRender
             return static_cast<ESMTerrain::LandObject*>(obj.get());
         else
         {
-            const auto world = MWBase::Environment::get().getWorld();
-            if (!world)
-                return nullptr;
+            const MWBase::World& world = *MWBase::Environment::get().getWorld();
 
             if (ESM::isEsm4Ext(cellIndex.mWorldspace))
             {
-                const ESM4::Land* land = world->getStore().get<ESM4::Land>().search(cellIndex);
+                const ESM4::Land* land = world.getStore().get<ESM4::Land>().search(cellIndex);
                 if (!land)
                     return nullptr;
                 osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(*land, mLoadFlags));
@@ -39,7 +37,7 @@ namespace MWRender
             }
             else
             {
-                const ESM::Land* land = world->getStore().get<ESM::Land>().search(cellIndex.mX, cellIndex.mY);
+                const ESM::Land* land = world.getStore().get<ESM::Land>().search(cellIndex.mX, cellIndex.mY);
                 if (!land)
                     return nullptr;
                 osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(*land, mLoadFlags));