diff --git a/src/layers/DailyViewLayer.cpp b/src/layers/DailyViewLayer.cpp index edb8e94..15b7306 100644 --- a/src/layers/DailyViewLayer.cpp +++ b/src/layers/DailyViewLayer.cpp @@ -26,7 +26,7 @@ bool DailyViewLayer::init(bool isWeekly) { auto GLM = GameLevelManager::sharedState(); auto winSize = CCDirector::sharedDirector()->getWinSize(); auto backgroundSprite = CCSprite::create("game_bg_14_001.png"); - bool controllerConnected = CCApplication::sharedApplication()->getControllerConnected(); + bool controllerConnected = BetterInfo::controllerConnected(); backgroundSprite->setScale(winSize.width / backgroundSprite->getContentSize().width); backgroundSprite->setAnchorPoint({0, 0}); diff --git a/src/layers/LeaderboardViewLayer.cpp b/src/layers/LeaderboardViewLayer.cpp index aa5d504..df60156 100644 --- a/src/layers/LeaderboardViewLayer.cpp +++ b/src/layers/LeaderboardViewLayer.cpp @@ -2,6 +2,7 @@ #include "JumpToPageLayer.h" //#include "../managers/CvoltonManager.h" #include "../managers/BetterInfoOnline.h" +#include "../utils.hpp" LeaderboardViewLayer* LeaderboardViewLayer::create(int accountID) { auto ret = new LeaderboardViewLayer(); @@ -24,7 +25,7 @@ bool LeaderboardViewLayer::init(int accountID) { auto GLM = GameLevelManager::sharedState(); auto winSize = CCDirector::sharedDirector()->getWinSize(); auto backgroundSprite = CCSprite::create("game_bg_14_001.png"); - bool controllerConnected = CCApplication::sharedApplication()->getControllerConnected(); + bool controllerConnected = BetterInfo::controllerConnected(); backgroundSprite->setScale(winSize.width / backgroundSprite->getContentSize().width); backgroundSprite->setAnchorPoint({0, 0}); diff --git a/src/layers/LevelSearchViewLayer.cpp b/src/layers/LevelSearchViewLayer.cpp index 96677b0..f273fef 100644 --- a/src/layers/LevelSearchViewLayer.cpp +++ b/src/layers/LevelSearchViewLayer.cpp @@ -43,7 +43,7 @@ bool LevelSearchViewLayer::init(BISearchObject searchObj) { auto GLM = GameLevelManager::sharedState(); auto winSize = CCDirector::sharedDirector()->getWinSize(); auto backgroundSprite = CCSprite::create("game_bg_14_001.png"); - bool controllerConnected = CCApplication::sharedApplication()->getControllerConnected(); + bool controllerConnected = BetterInfo::controllerConnected(); backgroundSprite->setScale(winSize.width / backgroundSprite->getContentSize().width); backgroundSprite->setAnchorPoint({0, 0}); diff --git a/src/layers/RewardViewLayer.cpp b/src/layers/RewardViewLayer.cpp index 7019437..dee43c6 100644 --- a/src/layers/RewardViewLayer.cpp +++ b/src/layers/RewardViewLayer.cpp @@ -32,7 +32,7 @@ bool RewardViewLayer::init(CCDictionary* chests, const char* title) { auto GSM = GameStatsManager::sharedState(); auto winSize = CCDirector::sharedDirector()->getWinSize(); auto backgroundSprite = CCSprite::create("game_bg_14_001.png"); - bool controllerConnected = CCApplication::sharedApplication()->getControllerConnected(); + bool controllerConnected = BetterInfo::controllerConnected(); backgroundSprite->setScale(winSize.width / backgroundSprite->getContentSize().width); backgroundSprite->setAnchorPoint({0, 0}); diff --git a/src/managers/BetterInfoStats.cpp b/src/managers/BetterInfoStats.cpp index d51ae3c..eb3ac94 100644 --- a/src/managers/BetterInfoStats.cpp +++ b/src/managers/BetterInfoStats.cpp @@ -8,7 +8,11 @@ bool BetterInfoStats::init(){ if(!init) return false; this->m_fileName = fmt::format("geode/mods/{}/CCBetterInfoStats.dat", Mod::get()->getID()); - this->migrateSaveData(); + #ifdef GEODE_IS_ANDROID + this->m_fileName = "CCBetterInfoStats.dat"; + #else + this->migrateSaveData(); + #endif auto FU = CCFileUtils::sharedFileUtils(); diff --git a/src/utils.cpp b/src/utils.cpp index 8e163d1..d25269b 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -253,7 +253,9 @@ std::string BetterInfo::isoTimeToString(const std::string& input) { } void BetterInfo::copyToClipboard(const char* text){ + #ifndef GEODE_IS_ANDROID clipboard::write(text); + #endif } void BetterInfo::copyToClipboard(const char* text, CCLayer* parent){ @@ -585,5 +587,12 @@ float BetterInfo::timeForLevelString(const std::string& levelString) { log::error("An exception has occured while calculating time for levelString: {}", e.what()); return 0; } +} +bool BetterInfo::controllerConnected() { + #ifdef GEODE_IS_ANDROID + return false; + #else + return CCApplication::sharedApplication()->getControllerConnected(); + #endif } \ No newline at end of file diff --git a/src/utils.hpp b/src/utils.hpp index 5cff198..aedf7a8 100644 --- a/src/utils.hpp +++ b/src/utils.hpp @@ -55,4 +55,6 @@ namespace BetterInfo { void reloadUsernames(LevelBrowserLayer* levelBrowserLayer); float timeForLevelString(const std::string& levelString); + + bool controllerConnected(); } \ No newline at end of file