From c1a139e8ace17e45e8ca6977b6f6b19a1a4195f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 11 Feb 2017 08:57:47 +0100 Subject: Use ESFormats for TMDs We already have a TMDReader, so let's actually use it. And move ESFormats to IOS::ES, since it's definitely part of IOS. This adds a DiscIO dependency on Core which will be fixed in a follow-up PR. --- Source/Core/DolphinWX/MainMenuBar.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinWX/MainMenuBar.cpp') diff --git a/Source/Core/DolphinWX/MainMenuBar.cpp b/Source/Core/DolphinWX/MainMenuBar.cpp index 6cf1240b30..a0ec767fff 100644 --- a/Source/Core/DolphinWX/MainMenuBar.cpp +++ b/Source/Core/DolphinWX/MainMenuBar.cpp @@ -12,6 +12,7 @@ #include "Core/Core.h" #include "Core/PowerPC/PowerPC.h" #include "Core/State.h" +#include "DiscIO/Enums.h" #include "DiscIO/NANDContentLoader.h" #include "DolphinWX/Globals.h" #include "DolphinWX/WxUtils.h" @@ -546,8 +547,8 @@ void MainMenuBar::RefreshWiiSystemMenuLabel() const if (sys_menu_loader.IsValid()) { - const auto sys_menu_version = sys_menu_loader.GetTitleVersion(); - const auto sys_menu_region = sys_menu_loader.GetCountryChar(); + const u16 sys_menu_version = sys_menu_loader.GetTMD().GetTitleVersion(); + const char sys_menu_region = DiscIO::GetSysMenuRegion(sys_menu_version); item->Enable(); item->SetItemLabel( wxString::Format(_("Load Wii System Menu %u%c"), sys_menu_version, sys_menu_region)); -- cgit v1.2.3