Skip to content

Commit 258942e

Browse files
committed
v1.7.96
1 parent 0a6eef5 commit 258942e

File tree

3 files changed

+34
-9
lines changed

3 files changed

+34
-9
lines changed

changelog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 1.7.9(5)
1+
# 1.7.9(6)
22

33
- Removed Comment Emojis integration to fix lag
44
- Improved Performance
@@ -9,6 +9,7 @@
99
- Fixed crash opening language select caused by other developer update
1010
- Made Safe Zone config button easier to click
1111
- Fixed Show Hitboxes showing player 2 hitbox when it isn't meant to :P
12+
- Added Reset Audio Sliders button to fix audio sliders going off screen (Thanks @anhnguyenlost13)
1213
- Added **Noclip SFX on Death**
1314

1415
# 1.7.8

mod.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"geode": "4.5.0",
3-
"version": "v1.7.95",
2+
"geode": "4.4.0",
3+
"version": "v1.7.96",
44
"gd": {
55
"win": "2.2074",
66
"android": "2.2074",

src/Client/Types/ResetAudioModule.cpp

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ void ResetAudioModule::load()
2323
void ResetAudioModule::makeAndroid(CCNode* menu, CCPoint pos)
2424
{
2525
const auto spr = CCScale9Sprite::create("geode.loader/GE_button_04.png");
26-
spr->setScale(1.f);
26+
spr->setScale(0.7f);
2727

2828
const auto label = TransLabelBMFont::create("Reset Audio Sliders", "bigFont.fnt");
2929
label->setScale(0.75f);
3030

31-
spr->setContentSize({ label->getScaledContentWidth() + 20.0f, 40.0f }); // magical numbers
31+
spr->setContentSize({ label->getScaledContentWidth() + 20.0f, 40.0f }); // magical numbers\
3232
3333
label->setAnchorPoint({0.5f, 0.5f});
3434
label->setPosition(spr->getContentSize() / 2);
@@ -38,12 +38,36 @@ void ResetAudioModule::makeAndroid(CCNode* menu, CCPoint pos)
3838
const auto btn = CCMenuItemSpriteExtra::create(spr, this, menu_selector(ResetAudioModule::onResetAudio));
3939
btn->setPosition({ menu->getContentWidth()/2, menu->getContentHeight()/2 });
4040

41+
auto info = InfoAlertButton::create("Reset Audio Sliders", "Resets the audio sliders to 100% incase it went off screen and you can't get it back.", 0.6f);
42+
info->setPosition(btn->getPosition() + ccp(105, 20));
43+
4144
menu->addChild(btn);
45+
menu->addChild(info);
4246
}
43-
// ReSharper disable once CppMemberFunctionMayBeStatic
47+
4448
void ResetAudioModule::onResetAudio(CCObject* sender)
4549
{
46-
// what it says on the tin
47-
FMODAudioEngine::sharedEngine()->setBackgroundMusicVolume(1.f);
48-
FMODAudioEngine::sharedEngine()->setEffectsVolume(1.f);
50+
FMODAudioEngine::sharedEngine()->setBackgroundMusicVolume(1.0f);
51+
FMODAudioEngine::sharedEngine()->setEffectsVolume(1.0f);
52+
53+
if (auto menu = CCScene::get()->getChildByType<MenuLayer>(0))
54+
{
55+
if (auto options = menu->getChildByType<OptionsLayer>(0))
56+
{
57+
if (auto layer = options->getChildByType<CCLayer>(0))
58+
{
59+
if (auto slider = layer->getChildByType<Slider>(0))
60+
{
61+
slider->setValue(1);
62+
slider->updateBar();
63+
}
64+
65+
if (auto slider = layer->getChildByType<Slider>(-1))
66+
{
67+
slider->setValue(1);
68+
slider->updateBar();
69+
}
70+
}
71+
}
72+
}
4973
}

0 commit comments

Comments
 (0)