[TexturePackSelectionState] World reload request added. Prevents a bu…

…g with incomplete texture packs (see #167).
Unarelith · Jul 28, 2020 · 4337868 · 4337868
1 parent 6202717
commit 4337868
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/source/client/states/GameState.cpp b/source/client/states/GameState.cpp
@@ -167,7 +167,7 @@ void GameState::onEvent(const SDL_Event &event) {
 
 void GameState::update() {
 	m_world.checkPlayerChunk(m_player.x(), m_player.y(), m_player.z());
-	m_world.update(!m_stateStack->empty() && &m_stateStack->top() == this);
+	m_world.update(!m_stateStack->empty() && (&m_stateStack->top() == this || m_stateStack->top().parent() == this));
 
 	if (m_camera.getFieldOfView() != Config::cameraFOV)
 		m_camera.setFieldOfView(Config::cameraFOV);

diff --git a/source/client/states/TexturePackSelectionState.cpp b/source/client/states/TexturePackSelectionState.cpp
@@ -33,6 +33,7 @@
 #include "GameConfig.hpp"
 #include "TextureAtlas.hpp"
 #include "TexturePackSelectionState.hpp"
+#include "World.hpp"
 
 namespace fs = ghc::filesystem;
 
@@ -61,6 +62,8 @@ TexturePackSelectionState::TexturePackSelectionState(gk::ApplicationState *paren
 					auto &atlas = gk::ResourceHandler::getInstance().get<TextureAtlas>("atlas-blocks");
 					atlas.clear();
 					atlas.loadFromRegistry(Config::texturePack);
+
+					World::isReloadRequested = true;
 				}
 			}
 		}