Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'flat-flags' 
Fixes issue 5837.
  • Loading branch information
@jordan-woyak
jordan-woyak committed Jan 11, 2013
2 parents 35dce20 + 346922e commit f405663
Show file tree
Hide file tree
Showing 21 changed files with 723 additions and 731 deletions.
1 change: 1 addition & 0 deletions Source/Core/DiscIO/Src/Volume.h
View file
Expand Up @@ -56,6 +56,7 @@ class IVolume
COUNTRY_TAIWAN,
COUNTRY_SDK,
COUNTRY_UNKNOWN,
COUNTRY_GERMANY,
NUMBER_OF_COUNTRIES
};

Expand Down
4 changes: 3 additions & 1 deletion Source/Core/DiscIO/Src/VolumeCommon.cpp
View file
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion Source/Core/DolphinWX/Src/GameListCtrl.cpp
View file
Expand Up @@ -37,13 +37,16 @@
#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"
#include "../resources/Flag_USA.xpm"
#include "../resources/Flag_Taiwan.xpm"
#include "../resources/Flag_Korea.xpm"
#include "../resources/Flag_Unknown.xpm"
#include "../resources/Flag_SDK.xpm"

#include "../resources/Platform_Wad.xpm"
#include "../resources/Platform_Wii.xpm"
#include "../resources/Platform_Gamecube.xpm"
Expand Down Expand Up @@ -192,6 +195,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] =
Expand All @@ -205,7 +210,7 @@ void CGameListCtrl::InitBitmaps()
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] =
m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm), wxNullBitmap);
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] =
m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap);
m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm), wxNullBitmap);
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] =
m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap);

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/Src/ISOFile.cpp
View file
Expand Up @@ -36,7 +36,7 @@
#include "ChunkFile.h"
#include "../resources/no_banner.cpp"

#define CACHE_REVISION 0x10D
#define CACHE_REVISION 0x10E

#define DVD_BANNER_WIDTH 96
#define DVD_BANNER_HEIGHT 32
Expand Down
Binary file removed Source/Core/DolphinWX/resources/Flag_Europe.png
View file
Binary file not shown.
146 changes: 79 additions & 67 deletions Source/Core/DolphinWX/resources/Flag_Europe.xpm
View file
@@ -1,83 +1,95 @@
/* XPM */
static const char *const Flag_Europe_xpm[] = {
"96 32 48 1",
static const char * Flag_Europe_xpm[] = {
"96 32 60 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",
" ",
"+ c #003399",
"@ c #013498",
"# c #33527A",
"$ c #32527B",
"% c #103D90",
"& c #707555",
"* c #1B4389",
"= c #C9AC20",
"- c #C9AC21",
"; c #6F7556",
"> c #083994",
", c #E6BB0F",
"' c #4D606B",
") c #0B3A92",
"! c #4F616A",
"~ c #E5BB0F",
"{ c #16408C",
"] c #023597",
"^ c #737954",
"/ c #E7BE0F",
"( c #0D3A91",
"_ c #E8BE0E",
": c #727854",
"< c #2F4F7D",
"[ c #445B70",
"} c #455C6F",
"| c #2E4E7D",
"1 c #465D6F",
"2 c #CCAD1E",
"3 c #18418B",
"4 c #CBAD1E",
"5 c #2D4F7E",
"6 c #C0A626",
"7 c #C0A625",
"8 c #0E3B91",
"9 c #50636A",
"0 c #053696",
"a c #506369",
"b c #80804D",
"c c #E6BE0E",
"d c #083794",
"e c #E7BE0E",
"f c #7F7F4D",
"g c #103B8F",
"h c #17408B",
"i c #E5BB10",
"j c #485D6E",
"k c #0C3992",
"l c #0B3892",
"m c #495E6D",
"n c #E4BB10",
"o c #777B51",
"p c #264982",
"q c #C7AA21",
"r c #C6A923",
"s c #767A52",
"t c #3B5675",
"u c #3A5576",
" ",
" ",
" ",
" ",
"................................ ",
".++++++++++++++++++++++++++++++. ",
".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ",
".@@@@@@@@@@@@@#$%@@@@@@@@@@@@@@. ",
".@@@@@@@@@#$%@&*=@#$%@@@@@@@@@@. ",
".@@@@@@@@@&*=@-;>@&*=@@@@@@@@@@. ",
".@@@@@@@@@-;>@@@@@-;>@@@@@@@@@@. ",
".,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,. ",
".''''''')!~''''''''')!~''''''''. ",
".{{{{{{{]*^{{{{{{{{{]*^{{{{{{{{. ",
".///////(_://///////(_:////////. ",
".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ",
".[[[[[[[[[}|1[[[[[}|1[[[[[[[[[[. ",
".2222222223*4256723*42222222222. ",
".88888888890a8b*c890a8888888888. ",
".dddddddddddddefgdddddddddddddd. ",
".hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh. ",
".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ",
".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ",
".++++++++++++++++++++++++++++++. ",
".+++++++++++++@#$@+++++++++++++. ",
".++++++++++%&*+=-+*;%++++++++++. ",
".++++++++++>,'+))+!~>++++++++++. ",
".+++++++++{+]]++++]]+{+++++++++. ",
".++++++++^/(++++++++(_:++++++++. ",
".++++++++<[++++++++++}|++++++++. ",
".++++++++]++++++++++++]++++++++. ",
".+++++++123++++++++++341+++++++. ",
".+++++++56++++++++++++75+++++++. ",
".++++++++++++++++++++++++++++++. ",
".++++++++890++++++++0a8++++++++. ",
".++++++++bcd++++++++def++++++++. ",
".++++++++))+g++++++g+))++++++++. ",
".++++++++++hij+kl+mnh++++++++++. ",
".+++++++++++op@qr@ps+++++++++++. ",
".++++++++++++++tu++++++++++++++. ",
".++++++++++++++++++++++++++++++. ",
".++++++++++++++++++++++++++++++. ",
"................................ ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
Binary file removed Source/Core/DolphinWX/resources/Flag_France.png
View file
Binary file not shown.
88 changes: 24 additions & 64 deletions Source/Core/DolphinWX/resources/Flag_France.xpm
View file
@@ -1,80 +1,40 @@
/* XPM */
static const char *const Flag_France_xpm[] = {
"96 32 45 1",
static const char * Flag_France_xpm[] = {
"96 32 5 1",
" c None",
". c #000000",
"+ c #0000FF",
"+ c #002395",
"@ c #FFFFFF",
"# c #FF0000",
"$ c #0000FC",
"% c #0000F8",
"& c #FCFCFC",
"* c #FC0000",
"= c #0000F2",
"- c #F8F8F8",
"; c #F80000",
"> c #0000EC",
", c #F2F2F2",
"' c #F20000",
") c #0000E3",
"! c #ECECEC",
"~ c #EC0000",
"{ c #0000DB",
"] c #E3E3E3",
"^ c #E30000",
"/ c #0000D2",
"( c #DBDBDB",
"_ c #DB0000",
": c #0000C8",
"< c #D2D2D2",
"[ c #D20000",
"} c #0000BD",
"| c #C8C8C8",
"1 c #C80000",
"2 c #0000B1",
"3 c #BDBDBD",
"4 c #BD0000",
"5 c #0000A3",
"6 c #B1B1B1",
"7 c #B10000",
"8 c #000093",
"9 c #A3A3A3",
"0 c #A30000",
"a c #000080",
"b c #939393",
"c c #930000",
"d c #000077",
"e c #808080",
"f c #800000",
" ",
"# c #ED2939",
" ",
" ",
" ",
" ",
"................................ ",
".++++++++++@@@@@@@@@@@#########. ",
".++++++++++@@@@@@@@@@@#########. ",
".++++++++++@@@@@@@@@@@#########. ",
".++++++++++@@@@@@@@@@@#########. ",
".$$$$$$$$$$@@@@@@@@@@@#########. ",
".%%%%%%%%%%&&&&&&&&&&&*********. ",
".==========-----------;;;;;;;;;. ",
".>>>>>>>>>>,,,,,,,,,,,'''''''''. ",
".))))))))))!!!!!!!!!!!~~~~~~~~~. ",
".{{{{{{{{{{]]]]]]]]]]]^^^^^^^^^. ",
".//////////(((((((((((_________. ",
".::::::::::<<<<<<<<<<<[[[[[[[[[. ",
".}}}}}}}}}}|||||||||||111111111. ",
".222222222233333333333444444444. ",
".555555555566666666666777777777. ",
".888888888899999999999000000000. ",
".aaaaaaaaaabbbbbbbbbbbccccccccc. ",
".ddddddddddeeeeeeeeeeefffffffff. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
".++++++++++@@@@@@@@@@##########. ",
"................................ ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
41 changes: 41 additions & 0 deletions Source/Core/DolphinWX/resources/Flag_Germany.xpm
View file
@@ -0,0 +1,41 @@
/* XPM */
static const char * Flag_Germany_xpm[] = {
"96 32 6 1",
" c None",
". c #000000",
"+ c #4A0000",
"@ c #DD0000",
"# c #F48A00",
"$ c #FFCE00",
" ",
" ",
" ",
" ",
"................................ ",
"................................ ",
"................................ ",
"................................ ",
"................................ ",
"................................ ",
"................................ ",
".++++++++++++++++++++++++++++++. ",
".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ",
".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ",
".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ",
".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ",
".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ",
".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ",
".##############################. ",
".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
"................................ ",
" ",
" ",
" ",
" ",
" ",
" "};
Binary file removed Source/Core/DolphinWX/resources/Flag_Italy.png
View file
Binary file not shown.

0 comments on commit f405663

Please sign in to comment.