From a58c46be814398fa44bdbe92453d547f0becced4 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Fri, 16 Dec 2011 21:01:10 +0200 Subject: [PATCH] Gui change and an update to the gameini database. The "Notes" column is gone and in it's place an "Emulation Notes" column is placed (it contains the emulationissues lines from the game inis). Notes that contain useful info about the game can be seen with just a glance this way. Fixes issue 5043. --- Data/User/GameConfig/GLNP69.ini | 16 ++++++ Data/User/GameConfig/GUME52.ini | 14 ++++-- Data/User/GameConfig/GUMP52.ini | 10 ++-- Data/User/GameConfig/GXCE01.ini | 57 +++------------------- Data/User/GameConfig/REDE41.ini | 12 ++++- Data/User/GameConfig/REDJ41.ini | 16 ++++++ Data/User/GameConfig/REDP41.ini | 12 ++++- Data/User/GameConfig/RFBE01.ini | 19 ++++++++ Data/User/GameConfig/RFBJ01.ini | 19 ++++++++ Data/User/GameConfig/RFBP01.ini | 14 +++++- Data/User/GameConfig/RMHE08.ini | 3 +- Data/User/GameConfig/RMHJ08.ini | 3 +- Data/User/GameConfig/RMHP08.ini | 3 +- Data/User/GameConfig/RQREXJ.ini | 2 + Data/User/GameConfig/RQRJAF.ini | 2 + Data/User/GameConfig/RQRPAF.ini | 2 + Data/User/GameConfig/SOUE01.ini | 4 +- Data/User/GameConfig/SOUJ01.ini | 4 +- Data/User/GameConfig/SOUK01.ini | 4 +- Data/User/GameConfig/SOUP01.ini | 4 +- Data/User/GameConfig/SX4J01.ini | 3 +- Data/User/GameConfig/SX4P01.ini | 3 +- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 47 ++++++------------ Source/Core/DolphinWX/Src/GameListCtrl.h | 2 +- 24 files changed, 172 insertions(+), 103 deletions(-) create mode 100644 Data/User/GameConfig/GLNP69.ini create mode 100644 Data/User/GameConfig/REDJ41.ini create mode 100644 Data/User/GameConfig/RFBE01.ini create mode 100644 Data/User/GameConfig/RFBJ01.ini diff --git a/Data/User/GameConfig/GLNP69.ini b/Data/User/GameConfig/GLNP69.ini new file mode 100644 index 0000000000..b919c56baa --- /dev/null +++ b/Data/User/GameConfig/GLNP69.ini @@ -0,0 +1,16 @@ +# GLNP69 - Looney Tunes Back In Action +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GUME52.ini b/Data/User/GameConfig/GUME52.ini index 4fc9785ee0..396010c826 100644 --- a/Data/User/GameConfig/GUME52.ini +++ b/Data/User/GameConfig/GUME52.ini @@ -1,8 +1,16 @@ # GUME52 - Gun [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = only see nintendo thingy -EmulationStateId = 1 +EmulationIssues = Needs MMU to run, it gives a black screen after the intro video though. +EmulationStateId = 2 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GUMP52.ini b/Data/User/GameConfig/GUMP52.ini index 8ce1c4ca5a..4265749160 100644 --- a/Data/User/GameConfig/GUMP52.ini +++ b/Data/User/GameConfig/GUMP52.ini @@ -1,12 +1,16 @@ # GUMP52 - Gun [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Needs MMU to run, it gives a black screen after the intro video though. EmulationStateId = 2 -Issues="Trying to compile error" -EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] diff --git a/Data/User/GameConfig/GXCE01.ini b/Data/User/GameConfig/GXCE01.ini index bc971922af..a5c9b88862 100644 --- a/Data/User/GameConfig/GXCE01.ini +++ b/Data/User/GameConfig/GXCE01.ini @@ -4,59 +4,14 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. Last validated using ver. r1697 EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Use direct 3d 11 for less glitches. [OnFrame] [ActionReplay] -$(M) -0556D8F4 88000000 -C416C860 0000FF01 -$Unlock Bonuses -0556D8F5 08000000 -04321D44 FFFFFFFF -$Robo 1: Infinite Health -0556D8F6 08000000 -0424E194 447A0000 -$Robo 1: Dies With 1 Hit -0556D8F7 08000000 -3424E194 3F800000 -0424E194 3F800000 -$Robo 2: Infinite Health -0556D8F8 08000000 -042816B4 447A0000 -$Robo 2: Dies With 1 Hit -0556D8F9 08000000 -342816B4 3F800000 -042816B4 3F800000 -$Robo 3: Infinite Health -0556D8FA 08000000 -042B4BD4 447A0000 -$Robo 3: Dies With 1 Hit -0556D8FB 08000000 -342B4BD4 3F800000 -042B4BD4 3F800000 -$Robo 4: Infinite Health -0556D8FC 08000000 -042E80F4 447A0000 -$Robo 4: Dies With 1 Hit -0556D8FD 08000000 -342E80F4 3F800000 -042E80F4 3F800000 -$All Body Types -0556D8FE 08000000 -023BFB9C 0003FFFF -$All Gun Parts -0556D8FF 08000000 -023BFBBC 0003FFFF -$All Bomb Parts -0556D900 08000000 -023BFBDC 0003FFFF -$All Pod Parts -0556D901 08000000 -023BFBFC 0003FFFF -$All Leg Parts -0556D902 08000000 -023BFC1C 0003FFFF [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] - diff --git a/Data/User/GameConfig/REDE41.ini b/Data/User/GameConfig/REDE41.ini index ca72301284..4d4cce340c 100644 --- a/Data/User/GameConfig/REDE41.ini +++ b/Data/User/GameConfig/REDE41.ini @@ -1,6 +1,16 @@ # REDE41 - RedSteel NTSC [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 +EmulationStateId = 3 +EmulationIssues = Nunchuck doesn't work (both real and emulated). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/REDJ41.ini b/Data/User/GameConfig/REDJ41.ini new file mode 100644 index 0000000000..c0dc3d9b86 --- /dev/null +++ b/Data/User/GameConfig/REDJ41.ini @@ -0,0 +1,16 @@ +# REDJ41 - RedSteel NTSC +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 3 +EmulationIssues = Nunchuck doesn't work (both real and emulated). +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/REDP41.ini b/Data/User/GameConfig/REDP41.ini index b1b18e205e..28a37b3f0c 100644 --- a/Data/User/GameConfig/REDP41.ini +++ b/Data/User/GameConfig/REDP41.ini @@ -1,6 +1,16 @@ # REDP41 - RedSteel PAL [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 +EmulationStateId = 3 +EmulationIssues = Nunchuck doesn't work (both real and emulated). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RFBE01.ini b/Data/User/GameConfig/RFBE01.ini new file mode 100644 index 0000000000..9b3c8dd9de --- /dev/null +++ b/Data/User/GameConfig/RFBE01.ini @@ -0,0 +1,19 @@ +# RFBE01 - ENDLESS OCEAN +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs efb to ram for photos to be developed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +DlistCachingEnable = False diff --git a/Data/User/GameConfig/RFBJ01.ini b/Data/User/GameConfig/RFBJ01.ini new file mode 100644 index 0000000000..2d603b29b0 --- /dev/null +++ b/Data/User/GameConfig/RFBJ01.ini @@ -0,0 +1,19 @@ +# RFBJ01 - Forever Blue +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs efb to ram for photos to be developed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +DlistCachingEnable = False diff --git a/Data/User/GameConfig/RFBP01.ini b/Data/User/GameConfig/RFBP01.ini index c77844fef6..0208f62ec1 100644 --- a/Data/User/GameConfig/RFBP01.ini +++ b/Data/User/GameConfig/RFBP01.ini @@ -2,6 +2,18 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Needs efb to ram for photos to be developed. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +DlistCachingEnable = False diff --git a/Data/User/GameConfig/RMHE08.ini b/Data/User/GameConfig/RMHE08.ini index c9dd6910a0..aebbd4f7f8 100644 --- a/Data/User/GameConfig/RMHE08.ini +++ b/Data/User/GameConfig/RMHE08.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Use Directx9 plugin. Disable(enable cpu access) in the graphics plugin for playable speed(r6676). +EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d 9 & 11 to have playable speeds. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. +$Bloom OFF @@ -21,3 +21,4 @@ PH_ZFar = EFBAccessEnable = False EFBToTextureEnable = False EFBCopyEnable = True +EFBCopyCacheEnable = True diff --git a/Data/User/GameConfig/RMHJ08.ini b/Data/User/GameConfig/RMHJ08.ini index 924bc413fc..6a9b8231b8 100644 --- a/Data/User/GameConfig/RMHJ08.ini +++ b/Data/User/GameConfig/RMHJ08.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Use Directx9 plugin. Disable(enable cpu access) in the graphics plugin for playable speed(r6676). +EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d 9 & 11 to have playable speeds. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. 0x805DD6D4:dword:0x60000000 @@ -21,3 +21,4 @@ PH_ZFar = EFBAccessEnable = False EFBToTextureEnable = False EFBCopyEnable = True +EFBCopyCacheEnable = True diff --git a/Data/User/GameConfig/RMHP08.ini b/Data/User/GameConfig/RMHP08.ini index cbe5456828..d2f0179aa1 100644 --- a/Data/User/GameConfig/RMHP08.ini +++ b/Data/User/GameConfig/RMHP08.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Use Directx9 plugin. Disable(enable cpu access) in the graphics plugin for playable speed(r6676). +EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d 9 & 11 to have playable speeds. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -13,3 +13,4 @@ ProjectionHack = 0 EFBAccessEnable = False EFBToTextureEnable = False EFBCopyEnable = True +EFBCopyCacheEnable = True diff --git a/Data/User/GameConfig/RQREXJ.ini b/Data/User/GameConfig/RQREXJ.ini index 83b5f9f9ce..b3a8ed6f99 100644 --- a/Data/User/GameConfig/RQREXJ.ini +++ b/Data/User/GameConfig/RQREXJ.ini @@ -18,3 +18,5 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RQRJAF.ini b/Data/User/GameConfig/RQRJAF.ini index b60c421d9a..1a3d093110 100644 --- a/Data/User/GameConfig/RQRJAF.ini +++ b/Data/User/GameConfig/RQRJAF.ini @@ -18,3 +18,5 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RQRPAF.ini b/Data/User/GameConfig/RQRPAF.ini index 7253a3ac5f..58298f19e2 100644 --- a/Data/User/GameConfig/RQRPAF.ini +++ b/Data/User/GameConfig/RQRPAF.ini @@ -18,3 +18,5 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SOUE01.ini b/Data/User/GameConfig/SOUE01.ini index 5e9a8939d7..3a17851101 100644 --- a/Data/User/GameConfig/SOUE01.ini +++ b/Data/User/GameConfig/SOUE01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend and efb to ram for less graphic glitches. Needs real wiimote and motion plus. +EmulationIssues = Needs real wiimote and motion plus. Use direct 3d9 backend for less graphic issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,3 +16,5 @@ PH_ZFar = [Video_Hacks] EFBAccessEnable = True DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SOUJ01.ini b/Data/User/GameConfig/SOUJ01.ini index f868f5ccf2..67e67a1525 100644 --- a/Data/User/GameConfig/SOUJ01.ini +++ b/Data/User/GameConfig/SOUJ01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend and efb to ram for less graphic glitches. Needs real wiimote and motion plus. +EmulationIssues = Needs real wiimote and motion plus. Use direct 3d9 backend for less graphic issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,3 +16,5 @@ PH_ZFar = [Video_Hacks] EFBAccessEnable = True DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SOUK01.ini b/Data/User/GameConfig/SOUK01.ini index 800efb33d0..f169b324bf 100644 --- a/Data/User/GameConfig/SOUK01.ini +++ b/Data/User/GameConfig/SOUK01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend and efb to ram for less graphic glitches. Needs real wiimote and motion plus. +EmulationIssues = Needs real wiimote and motion plus. Use direct 3d9 backend for less graphic issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,3 +16,5 @@ PH_ZFar = [Video_Hacks] EFBAccessEnable = True DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SOUP01.ini b/Data/User/GameConfig/SOUP01.ini index 23f5acee83..0e80a81656 100644 --- a/Data/User/GameConfig/SOUP01.ini +++ b/Data/User/GameConfig/SOUP01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend and efb to ram for less graphic glitches. Needs real wiimote and motion plus. +EmulationIssues = Needs real wiimote and motion plus. Use direct 3d9 backend for less graphic issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,3 +16,5 @@ PH_ZFar = [Video_Hacks] EFBAccessEnable = True DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SX4J01.ini b/Data/User/GameConfig/SX4J01.ini index 2e2169a190..12d93d6744 100644 --- a/Data/User/GameConfig/SX4J01.ini +++ b/Data/User/GameConfig/SX4J01.ini @@ -1,10 +1,9 @@ # SX4J01 - Xenoblade [Core] Values set here will override the main dolphin settings. BlockMerging = 1 -SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. The game randomly freezes. +EmulationIssues = The game randomly freezes. Use LLE audio for sound issues. Per pixel lighting creates a glitch in ether cave with direct 3d 9. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SX4P01.ini b/Data/User/GameConfig/SX4P01.ini index b374dab682..b5988e291b 100644 --- a/Data/User/GameConfig/SX4P01.ini +++ b/Data/User/GameConfig/SX4P01.ini @@ -1,10 +1,9 @@ # SX4P01 - Xenoblade Chronicles [Core] Values set here will override the main dolphin settings. BlockMerging = 1 -SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. The game randomly freezes. +EmulationIssues = The game randomly freezes. Use LLE audio for sound issues. Per pixel lighting creates a glitch in ether cave with direct 3d 9. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 05f8c8365a..e8e6ce75a4 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -91,16 +91,6 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is case CGameListCtrl::COLUMN_TITLE: return strcasecmp(iso1->GetName(indexOne).c_str(), iso2->GetName(indexOther).c_str()) * t; - case CGameListCtrl::COLUMN_NOTES: - { - std::string cmp1 = - (iso1->GetPlatform() == GameListItem::GAMECUBE_DISC) ? - iso1->GetCompany() : iso1->GetDescription(indexOne); - std::string cmp2 = - (iso2->GetPlatform() == GameListItem::GAMECUBE_DISC) ? - iso2->GetCompany() : iso2->GetDescription(indexOther); - return strcasecmp(cmp1.c_str(), cmp2.c_str()) * t; - } case CGameListCtrl::COLUMN_COUNTRY: if(iso1->GetCountry() > iso2->GetCountry()) return 1 * t; @@ -133,7 +123,10 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is else return 0; } - break; + case CGameListCtrl::COLUMN_EMULATION_NOTES: + return strcasecmp(iso1->GetIssues().c_str(), + iso2->GetIssues().c_str()) * t; + break; } return 0; @@ -294,19 +287,20 @@ void CGameListCtrl::Update() // Instead of showing the notes + the company, which is unknown with // wii titles We show in the same column : company for GC games and // description for wii/wad games - InsertColumn(COLUMN_NOTES, _("Notes")); + InsertColumn(COLUMN_EMULATION_NOTES, _("Emulation Notes")); InsertColumn(COLUMN_COUNTRY, _T("")); InsertColumn(COLUMN_SIZE, _("Size")); InsertColumn(COLUMN_EMULATION_STATE, _("State")); - + // set initial sizes for columns SetColumnWidth(COLUMN_PLATFORM, 35); SetColumnWidth(COLUMN_BANNER, 96); SetColumnWidth(COLUMN_TITLE, 200); - SetColumnWidth(COLUMN_NOTES, 200); + SetColumnWidth(COLUMN_EMULATION_NOTES, 200); SetColumnWidth(COLUMN_COUNTRY, 32); SetColumnWidth(COLUMN_EMULATION_STATE, 50); + // add all items for (int i = 0; i < (int)m_ISOFiles.size(); i++) @@ -483,18 +477,12 @@ void CGameListCtrl::InsertItemInReportView(long _Index) wxString name = wxString(rISOFile.GetName(0).c_str(), SJISConv); m_gameList.append(StringFromFormat("%s (J)\n", (const char *)name.c_str())); SetItem(_Index, COLUMN_TITLE, name, -1); - SetItem(_Index, COLUMN_NOTES, wxString(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str(), - SJISConv), -1); } break; case DiscIO::IVolume::COUNTRY_USA: m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_TITLE, wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); - SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str()), -1); break; default: m_gameList.append(StringFromFormat("%s (E)\n", @@ -503,11 +491,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index) wxString::From8BitData( rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), -1); - SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? - company.c_str() : - rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), - -1); break; } } @@ -516,8 +499,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index) m_gameList.append(StringFromFormat("%s (WAD)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_TITLE, wxString(rISOFile.GetName(0).c_str(), SJISConv), -1); - SetItem(_Index, COLUMN_NOTES, - wxString(rISOFile.GetDescription(0).c_str(), SJISConv), -1); } #ifndef _WIN32 @@ -531,6 +512,10 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // File size SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1); + // Emulation notes + SetItem(_Index, COLUMN_EMULATION_NOTES, wxString::From8BitData(rISOFile.GetIssues().c_str()), -1); + SetColumnWidth(COLUMN_SIZE, wxLIST_AUTOSIZE); + // Background color SetBackgroundColor(); @@ -713,7 +698,7 @@ void CGameListCtrl::ScanForISOs() void CGameListCtrl::OnColBeginDrag(wxListEvent& event) { - if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_NOTES) + if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_EMULATION_NOTES) event.Veto(); } @@ -1331,13 +1316,13 @@ void CGameListCtrl::AutomaticColumnWidth() // We hide the Notes column if the window is too small if (resizable > 400) { - SetColumnWidth(COLUMN_TITLE, resizable / 2); - SetColumnWidth(COLUMN_NOTES, resizable / 2); + SetColumnWidth(COLUMN_TITLE, resizable / 2 ); + SetColumnWidth(COLUMN_EMULATION_NOTES, resizable / 2 ); } else { SetColumnWidth(COLUMN_TITLE, resizable); - SetColumnWidth(COLUMN_NOTES, 0); + SetColumnWidth(COLUMN_EMULATION_NOTES, 0); } } } diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h index 8fca14f632..48b1a118c4 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.h +++ b/Source/Core/DolphinWX/Src/GameListCtrl.h @@ -60,7 +60,7 @@ public: COLUMN_PLATFORM = 0, COLUMN_BANNER, COLUMN_TITLE, - COLUMN_NOTES, + COLUMN_EMULATION_NOTES, COLUMN_COUNTRY, COLUMN_SIZE, COLUMN_EMULATION_STATE,