Dehardcode some strings

This commit is contained in:
twinaphex 2020-09-01 21:51:11 +02:00
parent acc0f2143f
commit 17cf1ae58f
3 changed files with 8 additions and 5 deletions

View File

@ -78,7 +78,7 @@ uintptr_t cheevos_get_badge_texture(const char *badge, bool locked)
strlcpy(badge_file, badge, sizeof(badge_file)); strlcpy(badge_file, badge, sizeof(badge_file));
if (locked) if (locked)
strlcat(badge_file, "_lock", sizeof(badge_file)); strlcat(badge_file, "_lock", sizeof(badge_file));
strlcat(badge_file, ".png", sizeof(badge_file)); strlcat(badge_file, FILE_PATH_PNG_EXTENSION, sizeof(badge_file));
fill_pathname_application_special(fullpath, sizeof(fullpath), fill_pathname_application_special(fullpath, sizeof(fullpath),
APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES); APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);

View File

@ -1861,11 +1861,13 @@ static int rcheevos_iterate(rcheevos_coro_t* coro)
if (coro->j == 0) if (coro->j == 0)
snprintf(coro->badge_name, snprintf(coro->badge_name,
sizeof(coro->badge_name), sizeof(coro->badge_name),
"%s.png", coro->cheevo->info->badge); "%s" FILE_PATH_PNG_EXTENSION,
coro->cheevo->info->badge);
else else
snprintf(coro->badge_name, snprintf(coro->badge_name,
sizeof(coro->badge_name), sizeof(coro->badge_name),
"%s_lock.png", coro->cheevo->info->badge); "%s_lock" FILE_PATH_PNG_EXTENSION,
coro->cheevo->info->badge);
fill_pathname_join( fill_pathname_join(
coro->badge_fullpath, coro->badge_fullpath,
@ -1882,7 +1884,7 @@ static int rcheevos_iterate(rcheevos_coro_t* coro)
#endif #endif
snprintf(coro->url, snprintf(coro->url,
sizeof(coro->url), sizeof(coro->url),
"http://i.retroachievements.org/Badge/%s", FILE_PATH_RETROACHIEVEMENTS_URL "/Badge/%s",
coro->badge_name); coro->badge_name);
CORO_GOSUB(RCHEEVOS_HTTP_GET); CORO_GOSUB(RCHEEVOS_HTTP_GET);
@ -1891,7 +1893,7 @@ static int rcheevos_iterate(rcheevos_coro_t* coro)
{ {
if (!filestream_write_file(coro->badge_fullpath, if (!filestream_write_file(coro->badge_fullpath,
coro->json, coro->k)) coro->json, coro->k))
CHEEVOS_ERR(RCHEEVOS_TAG "error writing badge %s\n", coro->badge_fullpath); CHEEVOS_ERR(RCHEEVOS_TAG "Error writing badge %s\n", coro->badge_fullpath);
else else
{ {
CHEEVOS_FREE(coro->json); CHEEVOS_FREE(coro->json);

View File

@ -71,6 +71,7 @@ RETRO_BEGIN_DECLS
#define FILE_PATH_INDEX_DIRS_URL ".index-dirs" #define FILE_PATH_INDEX_DIRS_URL ".index-dirs"
#define FILE_PATH_INDEX_EXTENDED_URL ".index-extended" #define FILE_PATH_INDEX_EXTENDED_URL ".index-extended"
#define FILE_PATH_NETPLAY_ROOM_LIST_URL "registry.lpl" #define FILE_PATH_NETPLAY_ROOM_LIST_URL "registry.lpl"
#define FILE_PATH_RETROACHIEVEMENTS_URL "http://i.retroachievements.org"
#define FILE_PATH_LOBBY_LIBRETRO_URL "http://lobby.libretro.com/" #define FILE_PATH_LOBBY_LIBRETRO_URL "http://lobby.libretro.com/"
#define FILE_PATH_CORE_THUMBNAILS_URL "http://thumbnails.libretro.com" #define FILE_PATH_CORE_THUMBNAILS_URL "http://thumbnails.libretro.com"
#define FILE_PATH_CORE_THUMBNAILPACKS_URL "http://thumbnailpacks.libretro.com" #define FILE_PATH_CORE_THUMBNAILPACKS_URL "http://thumbnailpacks.libretro.com"