Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-24 01:28:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

This can just be made global at this point lol

Browse Source
This commit is contained in:
Willy-JL
2023-10-26 04:03:42 +01:00
parent f474e8c7ca
commit 28bcc09d9b
64 changed files with 249 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/xtreme/assets.c
+4 -4
View File
@@ -10,7 +10,7 @@
#define ICONS_FMT XTREME_ASSETS_PATH "/%s/Icons/%s"
void load_icon_animated(const Icon* replace, const char* name, FuriString* path, File* file) {
const char* pack = XTREME_SETTINGS()->asset_pack;
const char* pack = xtreme_settings.asset_pack;
furi_string_printf(path, ICONS_FMT "/meta", pack, name);
if(storage_file_open(file, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
int32_t icon_width, icon_height, frame_rate, frame_count;
@@ -61,7 +61,7 @@ void load_icon_animated(const Icon* replace, const char* name, FuriString* path,
}
void load_icon_static(const Icon* replace, const char* name, FuriString* path, File* file) {
furi_string_printf(path, ICONS_FMT ".bmx", XTREME_SETTINGS()->asset_pack, name);
furi_string_printf(path, ICONS_FMT ".bmx", xtreme_settings.asset_pack, name);
if(storage_file_open(file, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
uint64_t size = storage_file_size(file) - 8;
uint8_t* frame = malloc(size);
@@ -102,8 +102,8 @@ void free_icon(const Icon* icon) {
}
void XTREME_ASSETS_LOAD() {
const char* pack = XTREME_SETTINGS()->asset_pack;
XTREME_SETTINGS()->is_nsfw = !strncmp(pack, "NSFW", strlen("NSFW"));
const char* pack = xtreme_settings.asset_pack;
xtreme_settings.is_nsfw = !strncmp(pack, "NSFW", strlen("NSFW"));
if(pack[0] == '\0') return;
Storage* storage = furi_record_open(RECORD_STORAGE);
lib/xtreme/settings.c
-4
View File
@@ -252,7 +252,3 @@ void XTREME_SETTINGS_SAVE() {
flipper_format_free(file);
furi_record_close(RECORD_STORAGE);
}
XtremeSettings* XTREME_SETTINGS() {
return &xtreme_settings;
}
lib/xtreme/xtreme.h
+1 -1
View File
@@ -92,7 +92,7 @@ typedef struct {
void XTREME_SETTINGS_LOAD();
void XTREME_SETTINGS_SAVE();
XtremeSettings* XTREME_SETTINGS();
extern XtremeSettings xtreme_settings;
void XTREME_ASSETS_LOAD();
void XTREME_ASSETS_FREE();