Skip to content

Commit de844f6

Browse files
committed
Revert changes from previous update
1 parent 46483c5 commit de844f6

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"geode": "4.3.1",
3-
"version": "v1.10.4",
3+
"version": "v1.10.5",
44
"gd": {
55
"win": "2.2074",
66
"mac": "2.2074",

resources/hacks/global.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@
105105
"name": "Speedhack Audio",
106106
"desc": "Whether or not to also change the audio speed based on the speedhack value.",
107107
"type": "bool",
108-
"default": true,
109-
"platforms": ["win","android32","android64","mac"]
108+
"default": true
110109
},
111110
{
112111
"name": "Reset Speedhack",

src/hacks.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ class $modify(GJGameLevel) {
9595
////GJGameLevel::saveNewScore
9696

9797
// sorry, some people are rushing me to release this, youll get your chance Mac OS users.
98+
#if !defined(GEODE_IS_MACOS) && !defined(GEODE_IS_IOS)
9899
void proceedWithReset(LevelInfoLayer* levelInfoLayer, GJGameLevel* level, bool resetStars, bool resetCoins) {
99100
geode::createQuickPopup(
100101
"Final Warning",
@@ -153,13 +154,17 @@ void proceedWithReset(LevelInfoLayer* levelInfoLayer, GJGameLevel* level, bool r
153154
);
154155

155156
}
157+
#endif
156158

157159
void Hacks::resetLevel(LevelInfoLayer* levelInfoLayer, GJGameLevel* level) {
158160
if (CCScene::get() == nullptr) return;
159161
auto prismUIExists = CCScene::get()->getChildByID("prism-menu");
160162
if (prismUIExists != nullptr) {
161163
static_cast<PrismUI*>(prismUIExists)->onClose(CCNode::create());
162164
}
165+
#if defined(GEODE_IS_MACOS) || defined(GEODE_IS_IOS)
166+
FLAlertLayer::create("Notice", "This currently does not work on <cy>Mac OS</c> and <cy>iOS</c>", "OK")->show();
167+
#else
163168
if (level->m_dailyID > 0) {
164169
FLAlertLayer::create("Notice", "This currently does not work on <cy>daily</c> or <cy>weekly</c> levels.", "OK")->show();
165170
return;
@@ -210,6 +215,7 @@ void Hacks::resetLevel(LevelInfoLayer* levelInfoLayer, GJGameLevel* level) {
210215
}, true, true
211216
);
212217
}
218+
#endif
213219
}
214220

215221
/*
@@ -237,7 +243,7 @@ class $modify(PrismTPS, GJBaseGameLayer) {
237243
log::error("Something went horribly wrong while hooking GJBaseGameLayer::getModifiedDelta");
238244
return;
239245
}
240-
res.unwrap()->disable();
246+
(void)res.unwrap()->disable();
241247
log::info("Disabled GJBaseGameLayer::getModifiedDelta");
242248
}
243249
float getModifiedDelta(float dt) {

0 commit comments

Comments
 (0)