Skip to content

Commit 2005033

Browse files
committed
RRemove panorama on mac temporarily
1 parent 858b185 commit 2005033

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

src/ui/hooks/LoadingLayer.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,15 @@ class $modify(MyLoadingLayer, LoadingLayer){
6262
}
6363
}
6464

65-
#ifdef GEODE_IS_WINDOWS
66-
6765
bool init(bool p0){
6866

6967
if(!LoadingLayer::init(p0)){
7068
return false;
7169
}
7270

71+
auto searchPath = dirs::getModRuntimeDir() / Mod::get()->getID() / "resources";
72+
CCFileUtils::get()->addSearchPath(searchPath.string().c_str());
73+
7374
MyLoadingLayer* myself = static_cast<MyLoadingLayer*>(this);
7475

7576
#ifdef GEODE_IS_WINDOWS
@@ -133,14 +134,14 @@ class $modify(MyLoadingLayer, LoadingLayer){
133134
loadingBar->setID("loading-bar"_spr);
134135
this->addChild(loadingBar);
135136

136-
CCSprite* titleSprite = Utils::createSprite("/geode/unzipped/zalphalaneous.minecraft/resources/zalphalaneous.minecraft/mojangstudios.png");
137+
CCSprite* titleSprite = Utils::createSprite("mojangstudios.png"_spr);
137138

138139
titleSprite->setPosition({winSize.width/2, winSize.height/2});
139140
titleSprite->setScale(titleSprite->getScale()*0.3f);
140141

141142
this->addChild(titleSprite);
142143

143-
MCLabel* loadingText = MCLabel::create("", "/geode/unzipped/zalphalaneous.minecraft/resources/zalphalaneous.minecraft/minecraft.fnt");
144+
MCLabel* loadingText = MCLabel::create("", "minecraft.fnt"_spr);
144145
loadingText->setScale(0.4f);
145146
loadingText->setPosition({winSize.width/2, 30});
146147

@@ -151,7 +152,4 @@ class $modify(MyLoadingLayer, LoadingLayer){
151152

152153
return true;
153154
}
154-
155-
#endif
156-
157155
};

src/ui/hooks/MenuLayer.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,12 @@ class $modify(MyMenuLayer, MenuLayer) {
6565

6666
float scale = CCDirector::sharedDirector()->getContentScaleFactor()/4;
6767

68+
#ifndef GEODE_IS_MACOS
6869
Panorama* panorama = Panorama::create();
6970
panorama->setID("minecraft-panorama"_spr);
7071

7172
this->addChild(panorama);
73+
#endif
7274

7375
Utils::getNodeSafe(this, "main-menu")->setVisible(false);
7476
Utils::getNodeSafe(this, "profile-menu")->setVisible(false);
@@ -272,9 +274,6 @@ class $modify(MyMenuLayer, MenuLayer) {
272274
}
273275

274276
CCMenu* menu = typeinfo_cast<CCMenu*>(this->getChildByID("minecraft-menu"_spr));
275-
276-
Panorama* panorama = typeinfo_cast<Panorama*>(this->getChildByIDRecursive("minecraft-panorama"_spr));
277-
278277
CCSprite* title = typeinfo_cast<CCSprite*>(this->getChildByIDRecursive("minecraft-title"_spr));
279278
CCSprite* subtitle = typeinfo_cast<CCSprite*>(this->getChildByIDRecursive("minecraft-subtitle"_spr));
280279
CCLabelBMFont* splash = typeinfo_cast<CCLabelBMFont*>(this->getChildByIDRecursive("splash-text"_spr));

0 commit comments

Comments
 (0)