mirror of
https://github.com/BernardoGiordano/Checkpoint
synced 2024-11-24 17:53:03 +00:00
Cleanup
This commit is contained in:
parent
4d63cd566b
commit
6a649284cc
5 changed files with 3 additions and 15 deletions
|
@ -76,7 +76,7 @@ ICON_FLAGS := nosavebackups,visible
|
|||
#---------------------------------------------------------------------------------
|
||||
ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
|
||||
|
||||
CFLAGS := -g -Wall -Wextra -Wno-psabi -O2 -mword-relocations -flto \
|
||||
CFLAGS := -g -Wall -Wextra -Wno-psabi -O3 -mword-relocations -flto \
|
||||
-fomit-frame-pointer -ffunction-sections \
|
||||
$(ARCH) \
|
||||
-DVERSION_MAJOR=${VERSION_MAJOR} \
|
||||
|
|
|
@ -13,6 +13,5 @@
|
|||
},
|
||||
"nand_saves": false,
|
||||
"scan_cart": false,
|
||||
"ftp-enabled": false,
|
||||
"version": 3
|
||||
}
|
|
@ -48,7 +48,6 @@ public:
|
|||
bool favorite(u64 id);
|
||||
bool nandSaves(void);
|
||||
bool shouldScanCard(void);
|
||||
bool isFTPEnabled(void);
|
||||
std::vector<std::u16string> additionalSaveFolders(u64 id);
|
||||
std::vector<std::u16string> additionalExtdataFolders(u64 id);
|
||||
|
||||
|
@ -66,7 +65,7 @@ private:
|
|||
nlohmann::json mJson;
|
||||
std::unordered_set<u64> mFilterIds, mFavoriteIds;
|
||||
std::unordered_map<u64, std::vector<std::u16string>> mAdditionalSaveFolders, mAdditionalExtdataFolders;
|
||||
bool mNandSaves, mScanCard, mFTPEnabled;
|
||||
bool mNandSaves, mScanCard;
|
||||
std::string BASEPATH = "/3ds/Checkpoint/config.json";
|
||||
};
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ MainScreen::MainScreen(void) : hid(rowlen * collen, collen)
|
|||
C2D_TextOptimize(&bot_ts);
|
||||
C2D_TextOptimize(&bot_x);
|
||||
|
||||
C2D_PlainImageTint(&checkboxTint, COLOR_GREY_MEDIUM, 1.0f);
|
||||
C2D_PlainImageTint(&checkboxTint, COLOR_GREY_DARKER, 1.0f);
|
||||
}
|
||||
|
||||
MainScreen::~MainScreen(void)
|
||||
|
|
|
@ -49,10 +49,6 @@ Configuration::Configuration(void)
|
|||
mJson["nand_saves"] = false;
|
||||
updateJson = true;
|
||||
}
|
||||
if (!(mJson.contains("ftp-enabled") && mJson["ftp-enabled"].is_boolean())) {
|
||||
mJson["ftp-enabled"] = false;
|
||||
updateJson = true;
|
||||
}
|
||||
if (!(mJson.contains("scan_cart") && mJson["scan_cart"].is_boolean())) {
|
||||
mJson["scan_cart"] = false;
|
||||
updateJson = true;
|
||||
|
@ -123,7 +119,6 @@ Configuration::Configuration(void)
|
|||
|
||||
mNandSaves = mJson["nand_saves"];
|
||||
mScanCard = mJson["scan_cart"];
|
||||
mFTPEnabled = mJson["ftp-enabled"];
|
||||
|
||||
// parse additional save folders
|
||||
auto js = mJson["additional_save_folders"];
|
||||
|
@ -210,9 +205,4 @@ std::vector<std::u16string> Configuration::additionalExtdataFolders(u64 id)
|
|||
bool Configuration::shouldScanCard(void)
|
||||
{
|
||||
return mScanCard;
|
||||
}
|
||||
|
||||
bool Configuration::isFTPEnabled(void)
|
||||
{
|
||||
return mFTPEnabled;
|
||||
}
|
Loading…
Reference in a new issue