From b497b28a56195490b1809c7ed3186a791fc462df Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 19 Jun 2015 21:41:54 +0200 Subject: [PATCH] (Menu) Hash updates --- menu/menu_displaylist.c | 21 ++++++++++++++------- menu/menu_hash.c | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index e443033b82..827467c449 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1024,7 +1024,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) if (db_info_entry->famitsu_magazine_rating) { if (create_string_list_rdb_entry_int("Famitsu Magazine Rating", - "rdb_entry_famitsu_magazine_rating", db_info_entry->famitsu_magazine_rating, + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_FAMITSU_MAGAZINE_RATING), + db_info_entry->famitsu_magazine_rating, info->path, info->list) == -1) goto error; } @@ -1069,37 +1070,43 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) } if (db_info_entry->bbfc_rating) { - if (create_string_list_rdb_entry_string("BBFC Rating", "rdb_entry_bbfc_rating", + if (create_string_list_rdb_entry_string("BBFC Rating", + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_BBFC_RATING), db_info_entry->bbfc_rating, info->path, info->list) == -1) goto error; } if (db_info_entry->esrb_rating) { - if (create_string_list_rdb_entry_string("ESRB Rating", "rdb_entry_esrb_rating", + if (create_string_list_rdb_entry_string("ESRB Rating", + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_ESRB_RATING), db_info_entry->esrb_rating, info->path, info->list) == -1) goto error; } if (db_info_entry->elspa_rating) { - if (create_string_list_rdb_entry_string("ELSPA Rating", "rdb_entry_elspa_rating", + if (create_string_list_rdb_entry_string("ELSPA Rating", + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_ELSPA_RATING), db_info_entry->elspa_rating, info->path, info->list) == -1) goto error; } if (db_info_entry->pegi_rating) { - if (create_string_list_rdb_entry_string("PEGI Rating", "rdb_entry_pegi_rating", + if (create_string_list_rdb_entry_string("PEGI Rating", + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_PEGI_RATING), db_info_entry->pegi_rating, info->path, info->list) == -1) goto error; } if (db_info_entry->enhancement_hw) { - if (create_string_list_rdb_entry_string("Enhancement Hardware", "rdb_entry_enhancement_hw", + if (create_string_list_rdb_entry_string("Enhancement Hardware", + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_ENHANCEMENT_HW), db_info_entry->enhancement_hw, info->path, info->list) == -1) goto error; } if (db_info_entry->cero_rating) { - if (create_string_list_rdb_entry_string("CERO Rating", "rdb_entry_cero_rating", + if (create_string_list_rdb_entry_string("CERO Rating", + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_CERO_RATING), db_info_entry->cero_rating, info->path, info->list) == -1) goto error; } diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 5f8e890b47..a7aea4a5f2 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -257,18 +257,32 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "rdb_entry_name"; case MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_RATING: return "rdb_entry_edge_magazine_rating"; + case MENU_LABEL_RDB_ENTRY_FAMITSU_MAGAZINE_RATING: + return "rdb_entry_famitsu_magazine_rating"; case MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_ISSUE: return "rdb_entry_edge_magazine_issue"; case MENU_LABEL_RDB_ENTRY_RELEASE_MONTH: return "rdb_entry_releasemonth"; case MENU_LABEL_RDB_ENTRY_RELEASE_YEAR: return "rdb_entry_releaseyear"; + case MENU_LABEL_RDB_ENTRY_ENHANCEMENT_HW: + return "rdb_entry_enhancement_hw"; case MENU_LABEL_RDB_ENTRY_SHA1: return "rdb_entry_sha1"; case MENU_LABEL_RDB_ENTRY_CRC32: return "rdb_entry_crc32"; case MENU_LABEL_RDB_ENTRY_MD5: return "rdb_entry_md5"; + case MENU_LABEL_RDB_ENTRY_BBFC_RATING: + return "rdb_entry_bbfc_rating"; + case MENU_LABEL_RDB_ENTRY_ESRB_RATING: + return "rdb_entry_esrb_rating"; + case MENU_LABEL_RDB_ENTRY_ELSPA_RATING: + return "rdb_entry_elspa_rating"; + case MENU_LABEL_RDB_ENTRY_PEGI_RATING: + return "rdb_entry_pegi_rating"; + case MENU_LABEL_RDB_ENTRY_CERO_RATING: + return "rdb_entry_cero_rating"; case MENU_LABEL_CONFIGURATIONS: return "configurations"; case MENU_LABEL_VALUE_CONFIGURATIONS: