ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'german-flag' into flat-flags

This commit is contained in:
Jordan Woyak 2013-01-10 18:21:59 -06:00
parent 51a1d4cde7 14b8d3f107
commit 58cbfdcbd3
5 changed files with 90 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/DiscIO/Src/Volume.h
View File

@ -47,6 +47,7 @@ public:
enum ECountry
{
COUNTRY_EUROPE = 0,
COUNTRY_GERMANY,
COUNTRY_FRANCE,
COUNTRY_RUSSIA,
COUNTRY_USA,

4
Source/Core/DiscIO/Src/VolumeCommon.cpp
View File

@ -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

3
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -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] =

BIN
Source/Core/DolphinWX/resources/Flag_Germany.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 795 B

83
Source/Core/DolphinWX/resources/Flag_Germany.xpm Normal file
View File

@ -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. ",
"................................ ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};