Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug if 'palettes' is in exe path

This commit is contained in:
Agent X 2024-05-19 12:55:46 -04:00
parent 1f3af25805
commit e617e5a5b4
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/game/player_palette.c
View File

@ -15,7 +15,7 @@ static ini_t* sPalette = NULL;
struct PresetPalette gPresetPalettes[MAX_PRESET_PALETTES] = { 0 }; struct PresetPalette gPresetPalettes[MAX_PRESET_PALETTES] = { 0 };
u16 gPresetPaletteCount = 0; u16 gPresetPaletteCount = 0;
static bool player_palette_init(const char* palettesPath, char* palette) { static bool player_palette_init(const char* palettesPath, char* palette, bool appendPalettes) {
// free old ini // free old ini
if (sPalette != NULL) { if (sPalette != NULL) {
ini_free(sPalette); ini_free(sPalette);
@ -25,10 +25,10 @@ static bool player_palette_init(const char* palettesPath, char* palette) {
// construct path // construct path
char path[SYS_MAX_PATH] = ""; char path[SYS_MAX_PATH] = "";
if (!palette || palette[0] == '\0') { palette = "Mario"; } if (!palette || palette[0] == '\0') { palette = "Mario"; }
if (strstr(palettesPath, PALETTES_DIRECTORY)) { if (appendPalettes) {
snprintf(path, SYS_MAX_PATH, "%s/%s.ini", palettesPath, palette);
} else {
snprintf(path, SYS_MAX_PATH, "%s/palettes/%s.ini", palettesPath, palette); snprintf(path, SYS_MAX_PATH, "%s/palettes/%s.ini", palettesPath, palette);
} else {
snprintf(path, SYS_MAX_PATH, "%s/%s.ini", palettesPath, palette);
} }
// load // load
@ -54,13 +54,13 @@ static u8 read_value(const char* data) {
return MIN(strtol(data, NULL, 0), 255); return MIN(strtol(data, NULL, 0), 255);
} }
void player_palettes_read(const char* palettesPath) { void player_palettes_read(const char* palettesPath, bool appendPalettes) {
// construct lang path // construct lang path
char lpath[SYS_MAX_PATH] = ""; char lpath[SYS_MAX_PATH] = "";
if (strstr(palettesPath, PALETTES_DIRECTORY)) { if (appendPalettes) {
strncpy(lpath, palettesPath, SYS_MAX_PATH);
} else {
snprintf(lpath, SYS_MAX_PATH, "%s/palettes", palettesPath); snprintf(lpath, SYS_MAX_PATH, "%s/palettes", palettesPath);
} else {
strncpy(lpath, palettesPath, SYS_MAX_PATH);
} }
// open directory // open directory
@ -84,7 +84,7 @@ void player_palettes_read(const char* palettesPath) {
} }
if (strlen(path) == 0) { continue; } if (strlen(path) == 0) { continue; }
if (!player_palette_init(palettesPath, path)) { if (!player_palette_init(palettesPath, path, appendPalettes)) {
#ifdef DEVELOPMENT #ifdef DEVELOPMENT
printf("Failed to load palette '%s.ini'\n", path); printf("Failed to load palette '%s.ini'\n", path);
#endif #endif
@ -177,13 +177,13 @@ EMBLEM_B = %d\n",
fclose(file); fclose(file);
} }
bool player_palette_delete(const char* palettesPath, char* name) { bool player_palette_delete(const char* palettesPath, char* name, bool appendPalettes) {
// construct lang path // construct lang path
char lpath[SYS_MAX_PATH] = ""; char lpath[SYS_MAX_PATH] = "";
if (strstr(palettesPath, PALETTES_DIRECTORY)) { if (appendPalettes) {
snprintf(lpath, SYS_MAX_PATH, "%s/%s.ini", palettesPath, name);
} else {
snprintf(lpath, SYS_MAX_PATH, "%s/palettes/%s.ini", palettesPath, name); snprintf(lpath, SYS_MAX_PATH, "%s/palettes/%s.ini", palettesPath, name);
} else {
snprintf(lpath, SYS_MAX_PATH, "%s/%s.ini", palettesPath, name);
} }
if (remove(lpath) == 0) { if (remove(lpath) == 0) {

4
src/game/player_palette.h
View File

@ -28,8 +28,8 @@ extern struct PresetPalette gPresetPalettes[MAX_PRESET_PALETTES];
extern u16 gPresetPaletteCount; extern u16 gPresetPaletteCount;
void player_palettes_reset(void); void player_palettes_reset(void);
void player_palettes_read(const char* palettePath); void player_palettes_read(const char* palettePath, bool appendPalettes);
void player_palette_export(char* name); void player_palette_export(char* name);
bool player_palette_delete(const char* palettesPath, char* name); bool player_palette_delete(const char* palettesPath, char* name, bool appendPalettes);
#endif #endif

6
src/pc/djui/djui_panel_player.c
View File

@ -166,7 +166,7 @@ static void djui_panel_player_edit_palette_delete(UNUSED struct DjuiBase* caller
// if (!player_palette_delete(fs_get_write_path(PALETTES_DIRECTORY), sPalettePresetNameTextBox->buffer)) { // if (!player_palette_delete(fs_get_write_path(PALETTES_DIRECTORY), sPalettePresetNameTextBox->buffer)) {
// player_palette_delete(sys_exe_path(), sPalettePresetNameTextBox->buffer); // player_palette_delete(sys_exe_path(), sPalettePresetNameTextBox->buffer);
// } // }
player_palette_delete(fs_get_write_path(PALETTES_DIRECTORY), sPalettePresetNameTextBox->buffer); player_palette_delete(fs_get_write_path(PALETTES_DIRECTORY), sPalettePresetNameTextBox->buffer, false);
sReloadPalettePresetSelection = true; sReloadPalettePresetSelection = true;
} }
@ -404,8 +404,8 @@ void djui_panel_player_create(struct DjuiBase* caller) {
djui_selectionbox_create(body, DLANG(PLAYER, MODEL), characterChoices, CT_MAX, &configPlayerModel, djui_panel_player_value_changed); djui_selectionbox_create(body, DLANG(PLAYER, MODEL), characterChoices, CT_MAX, &configPlayerModel, djui_panel_player_value_changed);
player_palettes_reset(); player_palettes_reset();
player_palettes_read(sys_exe_path()); player_palettes_read(sys_exe_path(), true);
player_palettes_read(fs_get_write_path(PALETTES_DIRECTORY)); player_palettes_read(fs_get_write_path(PALETTES_DIRECTORY), false);
char* palettePresets[MAX_PRESET_PALETTES + 1] = { "Custom" }; char* palettePresets[MAX_PRESET_PALETTES + 1] = { "Custom" };
if (gPresetPaletteCount > 0) { if (gPresetPaletteCount > 0) {