Skip to content

Commit 5585cb0

Browse files
committed
asd
1 parent 063a98b commit 5585cb0

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

mod.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@
1717
]
1818
}
1919
},
20-
"incompatibilities": [
21-
{
22-
"id": "bitz.customprofiles",
23-
"version": "*",
24-
"importance": "breaking"
25-
}
26-
],
2720
"settings": {
2821
"apply-profiles": {
2922
"name": "Apply to Profiles",

src/main.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class $modify(ProfilePage) {
2929
{
3030
bool a = ProfilePage::init(accountID, idk);
3131

32-
if (!Mod::get()->getSettingValue<bool>("apply-profiles"))
32+
if (!Mod::get()->getSettingValue<bool>("apply-profiles") || Loader::get()->getLoadedMod("bitz.customprofiles"))
3333
return a;
3434

3535
if (GradientPages::score)
@@ -98,7 +98,7 @@ class $modify(ProfilePage) {
9898

9999
ProfilePage::loadPageFromUserInfo(score);
100100

101-
if (!Mod::get()->getSettingValue<bool>("apply-profiles"))
101+
if (!Mod::get()->getSettingValue<bool>("apply-profiles") || Loader::get()->getLoadedMod("bitz.customprofiles"))
102102
return;
103103

104104
log::info("loadPageFromUserInfo");
@@ -143,7 +143,7 @@ class $modify (GJAccountSettingsLayer)
143143
if (!GJAccountSettingsLayer::init(idk))
144144
return false;
145145

146-
if (!Mod::get()->getSettingValue<bool>("apply-profiles"))
146+
if (!Mod::get()->getSettingValue<bool>("apply-profiles") || Loader::get()->getLoadedMod("bitz.customprofiles"))
147147
return true;
148148

149149
auto l = reinterpret_cast<CCLayer*>(this->getChildren()->objectAtIndex(0));
@@ -404,7 +404,7 @@ class $modify(InfoLayer) {
404404
if (!InfoLayer::init(level, score, p2))
405405
return false;
406406

407-
if (!Mod::get()->getSettingValue<bool>("apply-info-layer"))
407+
if (!Mod::get()->getSettingValue<bool>("apply-info-layer") || Loader::get()->getLoadedMod("bitz.customprofiles"))
408408
return true;
409409

410410
auto l = reinterpret_cast<CCLayer*>(this->getChildren()->objectAtIndex(0));
@@ -473,6 +473,9 @@ class $modify (GJCommentListLayer)
473473
{
474474
auto a = GJCommentListLayer::create(p0, p1, p2, p3, p4, p5);
475475

476+
if (Loader::get()->getLoadedMod("bitz.customprofiles"))
477+
return a;
478+
476479
if (!(Mod::get()->getSettingValue<bool>("apply-profiles") || Mod::get()->getSettingValue<bool>("apply-info-layer")))
477480
return a;
478481

0 commit comments

Comments
 (0)