diff --git a/loader/src/hooks/LoadingLayer.cpp b/loader/src/hooks/LoadingLayer.cpp index ecabff42..78ab6b4f 100644 --- a/loader/src/hooks/LoadingLayer.cpp +++ b/loader/src/hooks/LoadingLayer.cpp @@ -13,32 +13,36 @@ struct CustomLoadingLayer : Modify { CustomLoadingLayer() : m_updatingResources(false) {} bool init(bool fromReload) { - Loader::get()->waitForModsToBeLoaded(); + if (!fromReload) { + Loader::get()->waitForModsToBeLoaded(); + } if (!LoadingLayer::init(fromReload)) return false; - auto winSize = CCDirector::sharedDirector()->getWinSize(); + if (!fromReload) { + auto winSize = CCDirector::sharedDirector()->getWinSize(); - auto count = Loader::get()->getAllMods().size(); + auto count = Loader::get()->getAllMods().size(); - auto label = CCLabelBMFont::create( - fmt::format("Geode: Loaded {} mods", count).c_str(), - "goldFont.fnt" - ); - label->setPosition(winSize.width / 2, 30.f); - label->setScale(.45f); - label->setID("geode-loaded-info"); - this->addChild(label); + auto label = CCLabelBMFont::create( + fmt::format("Geode: Loaded {} mods", count).c_str(), + "goldFont.fnt" + ); + label->setPosition(winSize.width / 2, 30.f); + label->setScale(.45f); + label->setID("geode-loaded-info"); + this->addChild(label); - // fields have unpredictable destructors - this->addChild(EventListenerNode::create( - this, &CustomLoadingLayer::updateResourcesProgress - )); + // fields have unpredictable destructors + this->addChild(EventListenerNode::create( + this, &CustomLoadingLayer::updateResourcesProgress + )); - // verify loader resources - if (!LoaderImpl::get()->verifyLoaderResources()) { - m_fields->m_updatingResources = true; - this->setUpdateText("Downloading Resources"); + // verify loader resources + if (!LoaderImpl::get()->verifyLoaderResources()) { + m_fields->m_updatingResources = true; + this->setUpdateText("Downloading Resources"); + } } return true; diff --git a/loader/src/hooks/updateResources.cpp b/loader/src/hooks/updateResources.cpp index c9eeaf46..6345eeed 100644 --- a/loader/src/hooks/updateResources.cpp +++ b/loader/src/hooks/updateResources.cpp @@ -9,6 +9,7 @@ struct ResourcesUpdate : Modify { LoadingLayer::loadAssets(); // this is in case the user refreshes texture quality at runtime if (m_loadStep == 10) { + CCFileUtils::get()->updatePaths(); Loader::get()->updateResources(); } }