7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-02-17 00:30:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/geode-sdk/geode into main

Browse source
This commit is contained in:
HJfod 2024-02-03 19:50:18 +02:00
commit 25e3e048ef
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
loader/src/hooks/LoadingLayer.cpp
View file

@ -21,11 +21,9 @@ struct CustomLoadingLayer : Modify<CustomLoadingLayer, LoadingLayer> {
if (!self.setHookPriority("LoadingLayer::init", geode::node_ids::GEODE_ID_PRIORITY)) {
log::warn("Failed to set LoadingLayer::init hook priority, node IDs may not work properly");
}
GEODE_FORWARD_COMPAT_DISABLE_HOOKS_INNER("LoadingLayer stuff disabled")
GEODE_FORWARD_COMPAT_DISABLE_HOOKS_INNER("Switching to fallback custom loading layer")
}
GEODE_FORWARD_COMPAT_DISABLE_HOOKS("Switching to fallback custom loading layer")
void updateLoadedModsLabel() {
auto allMods = Loader::get()->getAllMods();
auto count = std::count_if(allMods.begin(), allMods.end(), [&](auto& item) {
@ -205,13 +203,22 @@ struct CustomLoadingLayer : Modify<CustomLoadingLayer, LoadingLayer> {
};
struct FallbackCustomLoadingLayer : Modify<FallbackCustomLoadingLayer, CCLayer> {
GEODE_FORWARD_COMPAT_ENABLE_HOOKS("")
static void onModify(auto& self) {
GEODE_FORWARD_COMPAT_ENABLE_HOOKS_INNER("")
else if (!self.setHookPriority("CCLayer::init", geode::node_ids::GEODE_ID_PRIORITY)) {
log::warn("Failed to set CCLayer::init hook priority, node IDs may not work properly");
}
}
bool init() {
if (!CCLayer::init())
return false;
if (!typeinfo_cast<LoadingLayer*>(this))
auto* self = typeinfo_cast<LoadingLayer*>(this);
if (!self)
return true;
NodeIDs::provideFor(self);
auto winSize = CCDirector::sharedDirector()->getWinSize();
auto label = CCLabelBMFont::create(