From 14b8d3f107c697c900ca0f401f06fc360dca7b5b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 22:53:04 -0600 Subject: [PATCH] Add support for german region flag. Still need to change image. (currently using a copy of europe flag) --- Source/Core/DiscIO/Src/Volume.h | 1 + Source/Core/DiscIO/Src/VolumeCommon.cpp | 4 +- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 + .../Core/DolphinWX/resources/Flag_Germany.png | Bin 0 -> 795 bytes .../Core/DolphinWX/resources/Flag_Germany.xpm | 83 ++++++++++++++++++ 5 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 Source/Core/DolphinWX/resources/Flag_Germany.png create mode 100644 Source/Core/DolphinWX/resources/Flag_Germany.xpm diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h index f8a6f13ecb..47cbc4f302 100644 --- a/Source/Core/DiscIO/Src/Volume.h +++ b/Source/Core/DiscIO/Src/Volume.h @@ -47,6 +47,7 @@ public: enum ECountry { COUNTRY_EUROPE = 0, + COUNTRY_GERMANY, COUNTRY_FRANCE, COUNTRY_RUSSIA, COUNTRY_USA, diff --git a/Source/Core/DiscIO/Src/VolumeCommon.cpp b/Source/Core/DiscIO/Src/VolumeCommon.cpp index f3389aea42..415af2725a 100644 --- a/Source/Core/DiscIO/Src/VolumeCommon.cpp +++ b/Source/Core/DiscIO/Src/VolumeCommon.cpp @@ -28,10 +28,12 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) // PAL case 'D': // German + return IVolume::COUNTRY_GERMANY; + break; + case 'X': // Used by a couple PAL games case 'Y': // German, french - case 'L': // Japanese import to PAL regions case 'M': // Japanese import to PAL regions case 'S': // Spanish-speaking regions diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 28051eb390..f0811a9d27 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -36,6 +36,7 @@ #include "Main.h" #include "../resources/Flag_Europe.xpm" +#include "../resources/Flag_Germany.xpm" #include "../resources/Flag_France.xpm" #include "../resources/Flag_Italy.xpm" #include "../resources/Flag_Japan.xpm" @@ -191,6 +192,8 @@ void CGameListCtrl::InitBitmaps() m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm), wxNullBitmap); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = + m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.png b/Source/Core/DolphinWX/resources/Flag_Germany.png new file mode 100644 index 0000000000000000000000000000000000000000..c41352f36a9f99809fdc50210496d29e2c11e479 GIT binary patch literal 795 zcmeAS@N?(olHy`uVBq!ia0y~yU`SwKU{DZXV_;y|8?aEEfq{W7$=luKKNxUEe80oM zz`$AH5n0T@z~BMKZYQ(tK!Rljj_EM{3>}N6ePm!@a`AL=45_&F_V!*cZATII4~yd- zZi(8Fp!o7gn$%Ho0YRp+mz($nX6vSV@Bh_mvQfyzcWJ9Dhqh)7JGcCSQ@YpqMNB)+ z=&GrduS%JGmgmmj|FfKLoH=>Y;PAPd0!j>E(9ksFqNC>ZR*QLUlGjBWr0f6He*FD< zm(1>G&tk$E)=5eylwB*eWGIV_|8(Ze{rfKa-v6FH-DTeMO3z1CQVSlG@GrRXWa7-9 zue~+zfB)Ofz0~IX=Xvwkt}mVP>4C#a6W?H^rL)ea6_=NP`B>@p#qPr7`-h~q9cUGJ z^et?q+v1B6abc@s^rkP)07>UCyf~Sk$Q%9OvfO;tB<6;X5?`JlFSRT?d;a@!#(qcc zQyERW@4lHh^XFS%^R4OWyH?iL$k@+6`-j2y7vG0Jb8NjdQzd4lf15k^`Da(j)1+WwtGep?>#vKI z7in}Ydi?lcY1%WBtG;i~_TIeGXJmJtBjFBXT)eu!#PPyCn--ma!_EEc%)VV#C*)Zi z3rbx@+7c^j*WTa1&o5+c*ybdh@v+mpLdnIrC z?da&T{eSMo)k|Gq7MZe%H;-S z0dT~Ei9h}Sm=;+6$h~kWej)<{gKCLuL`h0wNvc(HQEFmIDua=Mfu*j2xvqhEh>@|C sv6+>Dk+y-cm4U(5D=q9O8glbfGSez?YdF$rvm0ckr>mdKI;Vst0Icm$xBvhE literal 0 HcmV?d00001 diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm new file mode 100644 index 0000000000..f0ca5a0934 --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -0,0 +1,83 @@ +/* XPM */ +static const char *const Flag_Germany_xpm[] = { +"96 32 48 1", +" c None", +". c #000000", +"+ c #0000FD", +"@ c #0000FF", +"# c #0808F7", +"$ c #5C5CA3", +"% c #1717E8", +"& c #767680", +"* c #EDED00", +"= c #A5A54D", +"- c #2E2EB9", +"; c #96961A", +"> c #4A4A8E", +", c #0000FB", +"' c #0000F4", +") c #0808EC", +"! c #5C5C9B", +"~ c #1717DD", +"{ c #0000EE", +"] c #767677", +"^ c #A5A547", +"/ c #0000DD", +"( c #2E2EA0", +"_ c #969616", +": c #4A4A7B", +"< c #0000D2", +"[ c #0000C6", +"} c #0808BF", +"| c #5C5C7E", +"1 c #1717B4", +"2 c #0000B9", +"3 c #76765C", +"4 c #A5A537", +"5 c #0808B3", +"6 c #5C5C76", +"7 c #1717A8", +"8 c #0000A9", +"9 c #2E2E7A", +"0 c #969611", +"a c #4A4A5E", +"b c #767654", +"c c #A5A533", +"d c #000097", +"e c #2E2E6D", +"f c #96960F", +"g c #4A4A54", +"h c #000081", +"i c #000077", +" ", +" ", +" ", +" ", +" ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@#$%@@@@@@@@@@@@@@. ", +".@@@@@@@@@#$%@&*=@#$%@@@@@@@@@@. ", +".@@@@@@@@@&*=@-;>@&*=@@@@@@@@@@. ", +".@@@@@@@@@-;>@@@@@-;>@@@@@@@@@@. ", +".,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,. ", +".''''''')!~''''''''')!~''''''''. ", +".{{{{{{{]*^{{{{{{{{{]*^{{{{{{{{. ", +".///////(_://///////(_:////////. ", +".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", +".[[[[[[[[[}|1[[[[[}|1[[[[[[[[[[. ", +".2222222223*4256723*42222222222. ", +".88888888890a8b*c890a8888888888. ", +".dddddddddddddefgdddddddddddddd. ", +".hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh. ", +".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" ", +" "};