From 0799647a0bccf86d4e62c2ece9dbc8f344931099 Mon Sep 17 00:00:00 2001
From: XProger <xproger@list.ru>
Date: Sun, 20 May 2018 07:26:29 +0300
Subject: [PATCH] redraw inventory background after changing detail settings

---
 src/gapi_d3d9.h |  7 +++++--
 src/level.h     | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/gapi_d3d9.h b/src/gapi_d3d9.h
index f228fd5..a00b17d 100644
--- a/src/gapi_d3d9.h
+++ b/src/gapi_d3d9.h
@@ -463,11 +463,14 @@ namespace GAPI {
                 res.texture->deinit();
         }
 
-        if (defRT) { defRT->Release(); defRT = NULL; }
-        if (defDS) { defDS->Release(); defDS = NULL; }
+        if (defRT) defRT->Release();
+        if (defDS) defDS->Release();
 
         D3DCHECK(device->Reset(&d3dpp));
 
+        device->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &defRT);
+        device->GetDepthStencilSurface(&defDS);
+
     // reinit texture RTs
         for (int i = 0; i < tmpCount; i++) {
             Resource &res = tmpList[i];
diff --git a/src/level.h b/src/level.h
index d69c01e..d8f592f 100644
--- a/src/level.h
+++ b/src/level.h
@@ -50,7 +50,6 @@ struct Level : IGame {
 
     bool lastTitle;
     bool isEnded;
-    bool isFirstFrame;
 
     TR::Effect::Type effect;
     float      effectTimer;
@@ -246,7 +245,7 @@ struct Level : IGame {
         bool rebuildWater   = settings.detail.water != Core::settings.detail.water;
         bool rebuildShaders = rebuildWater || rebuildAmbient || rebuildShadows;
 
-        bool redraw = settings.detail.stereo != Core::settings.detail.stereo;
+        bool redraw = memcmp(&settings.detail, &Core::settings.detail, sizeof(settings.detail)) != 0;
 
     #ifdef _OS_ANDROID
         if ((settings.detail.stereo == Core::Settings::STEREO_VR) ^ (Core::settings.detail.stereo == Core::Settings::STEREO_VR))
@@ -282,8 +281,12 @@ struct Level : IGame {
             waterCache = Core::settings.detail.water > Core::Settings::LOW ? new WaterCache(this) : NULL;
         }
 
-        if (redraw && inventory.active && !level.isTitle())
+        if (redraw && inventory.active && !level.isTitle()) {
+            Core::reset();
+            Core::beginFrame();
             inventory.prepareBackground();
+            Core::endFrame();
+        }
     }
 
     virtual TR::Level* getLevel() {
@@ -704,6 +707,8 @@ struct Level : IGame {
 
             initShadow();
 
+            initReflections();
+
             for (int i = 0; i < level.soundSourcesCount; i++) {
                 TR::SoundSource &src = level.soundSources[i];
                 int flags = Sound::PAN;
@@ -723,8 +728,6 @@ struct Level : IGame {
 
         sndWater = sndTrack = NULL;
 
-        isFirstFrame = true;
-
         playTrack(0);
         /*
         if (level.id == TR::LVL_TR2_RIG) {
@@ -1238,6 +1241,8 @@ struct Level : IGame {
     }
 
     void initReflections() {
+        Core::reset();
+        Core::beginFrame();
         for (int i = 0; i < level.entitiesBaseCount; i++) {
             TR::Entity &e = level.entities[i];
             if (e.type == TR::Entity::CRYSTAL) {
@@ -1246,6 +1251,7 @@ struct Level : IGame {
                 c->environment->generateMipMap();
             }
         }
+        Core::endFrame();
     }
 
     void setMainLight(Controller *controller) {
@@ -2374,11 +2380,6 @@ struct Level : IGame {
     }
 
     void renderPrepare() {
-        if (isFirstFrame) {
-            initReflections();
-            isFirstFrame = false;
-        }
-
         if (ambientCache)
             ambientCache->processQueue();