summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorStevoisiak <Stevoisiak@gmail.com>2014-10-26 17:47:07 -0400
committerStevoisiak <Stevoisiak@gmail.com>2014-10-28 23:04:24 -0400
commit00620ea7291ab94d5b216d48567e6b06d77cf4e8 (patch)
treecbff6a1bfd796e5957143707a9e687e3fed94ad1 /Source/Core
parentf895648eb95369e2d302ba93cc4354d3880a7337 (diff)
Added flags for Russia and Australia
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DiscIO/Volume.h1
-rw-r--r--Source/Core/DiscIO/VolumeCommon.cpp4
-rw-r--r--Source/Core/DolphinWX/GameListCtrl.cpp24
-rw-r--r--Source/Core/DolphinWX/resources/Flag_Australia.xpm141
-rw-r--r--Source/Core/DolphinWX/resources/Flag_Russia.xpm43
5 files changed, 202 insertions, 11 deletions
diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h
index e9cc4eb692..0b10bf2387 100644
--- a/Source/Core/DiscIO/Volume.h
+++ b/Source/Core/DiscIO/Volume.h
@@ -47,6 +47,7 @@ public:
COUNTRY_SDK,
COUNTRY_UNKNOWN,
COUNTRY_GERMANY,
+ COUNTRY_AUSTRALIA,
NUMBER_OF_COUNTRIES
};
diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp
index efcd9c5f53..7da110403a 100644
--- a/Source/Core/DiscIO/VolumeCommon.cpp
+++ b/Source/Core/DiscIO/VolumeCommon.cpp
@@ -30,9 +30,11 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
case 'M': // Japanese import to PAL regions
case 'S': // Spanish-speaking regions
case 'P':
- case 'U': // Australia
return IVolume::COUNTRY_EUROPE;
+ case 'U': // Australia
+ return IVolume::COUNTRY_AUSTRALIA;
+
case 'F':
return IVolume::COUNTRY_FRANCE;
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp
index 2addf1f64a..47d0eab80f 100644
--- a/Source/Core/DolphinWX/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/GameListCtrl.cpp
@@ -65,12 +65,14 @@
#include "DolphinWX/ISOProperties.h"
#include "DolphinWX/Main.h"
#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/resources/Flag_Australia.xpm"
#include "DolphinWX/resources/Flag_Europe.xpm"
#include "DolphinWX/resources/Flag_France.xpm"
#include "DolphinWX/resources/Flag_Germany.xpm"
#include "DolphinWX/resources/Flag_Italy.xpm"
#include "DolphinWX/resources/Flag_Japan.xpm"
#include "DolphinWX/resources/Flag_Korea.xpm"
+#include "DolphinWX/resources/Flag_Russia.xpm"
#include "DolphinWX/resources/Flag_SDK.xpm"
#include "DolphinWX/resources/Flag_Taiwan.xpm"
#include "DolphinWX/resources/Flag_Unknown.xpm"
@@ -227,16 +229,18 @@ void CGameListCtrl::InitBitmaps()
SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES);
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm));
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm));
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm));
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = m_imageListSmall->Add(wxBitmap(Flag_USA_xpm));
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN] = m_imageListSmall->Add(wxBitmap(Flag_Japan_xpm));
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm));
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm));
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm));
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm));
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = m_imageListSmall->Add(wxBitmap(Flag_USA_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN] = m_imageListSmall->Add(wxBitmap(Flag_Japan_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_RUSSIA] = m_imageListSmall->Add(wxBitmap(Flag_Russia_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_AUSTRALIA] = m_imageListSmall->Add(wxBitmap(Flag_Australia_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm));
m_PlatformImageIndex.resize(3);
m_PlatformImageIndex[0] = m_imageListSmall->Add(wxBitmap(Platform_Gamecube_xpm));
diff --git a/Source/Core/DolphinWX/resources/Flag_Australia.xpm b/Source/Core/DolphinWX/resources/Flag_Australia.xpm
new file mode 100644
index 0000000000..ebc4f57613
--- /dev/null
+++ b/Source/Core/DolphinWX/resources/Flag_Australia.xpm
@@ -0,0 +1,141 @@
+/* XPM */
+static const char * Flag_Australia_xpm[] = {
+"96 32 106 2",
+" c None",
+". c #000000",
+"+ c #ED6786",
+"@ c #F6ECF1",
+"# c #7489B4",
+"$ c #032A78",
+"% c #002776",
+"& c #C797B3",
+"* c #E00034",
+"= c #817BA7",
+"- c #E75377",
+"; c #F4A8BA",
+"> c #7E7EA9",
+", c #E95E7F",
+"' c #F5ADBE",
+") c #C6CFE0",
+"! c #28498B",
+"~ c #2A488A",
+"{ c #D36F90",
+"] c #EB5C7D",
+"^ c #F5EAF0",
+"/ c #012877",
+"( c #204287",
+"_ c #C985A4",
+": c #EC6282",
+"< c #F8EBEF",
+"[ c #889ABF",
+"} c #C997B3",
+"| c #9584AB",
+"1 c #E84A6F",
+"2 c #F6B1C1",
+"3 c #BDC7DC",
+"4 c #143881",
+"5 c #758AB5",
+"6 c #BBC5DA",
+"7 c #BCC6DB",
+"8 c #DDDDE8",
+"9 c #F9D4DD",
+"0 c #FCE9EE",
+"a c #F4BDCB",
+"b c #F5B8C7",
+"c c #FAD4DC",
+"d c #FCF9FB",
+"e c #DAE0EB",
+"f c #244589",
+"g c #EAEDF4",
+"h c #234589",
+"i c #3D5B97",
+"j c #AAB7D1",
+"k c #ABB8D2",
+"l c #D1D8E6",
+"m c #FCF7F9",
+"n c #F9CBD5",
+"o c #F4B8C7",
+"p c #F3BCCB",
+"q c #FCE5EA",
+"r c #F7C3CF",
+"s c #D6D1E0",
+"t c #647CAC",
+"u c #294A8C",
+"v c #325191",
+"w c #D2D9E7",
+"x c #E75D7F",
+"y c #7072A2",
+"z c #667DAD",
+"A c #F2E8EE",
+"B c #D87393",
+"C c #345090",
+"D c #214388",
+"E c #052B79",
+"F c #072D7A",
+"G c #C3CCDF",
+"H c #F6E8EE",
+"I c #CF8AA6",
+"J c #C7D0E1",
+"K c #E74A70",
+"L c #8475A2",
+"M c #D8DEEA",
+"N c #627AAB",
+"O c #2C4C8E",
+"P c #1E4086",
+"Q c #F5AFBF",
+"R c #E85679",
+"S c #807AA6",
+"T c #F5E9EF",
+"U c #EC6080",
+"V c #335291",
+"W c #1C3F85",
+"X c #3C5A96",
+"Y c #0D327D",
+"Z c #7B8FB8",
+"` c #C1CADE",
+" . c #7C90B9",
+".. c #A6B4CF",
+"+. c #FFFFFF",
+"@. c #A5B3CF",
+"#. c #395795",
+"$. c #385694",
+"%. c #092F7B",
+"&. c #25468A",
+"*. c #5A73A6",
+"=. c #A8B5D0",
+"-. c #5972A6",
+";. c #2F4F8F",
+">. c #F9FAFC",
+",. c #7E92BA",
+" ",
+" ",
+" ",
+" ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". + @ # $ % % & * & % % $ = - ; % % % % % % % % % % % % % % % . ",
+". > , ' ) ! % & * & % ~ { ] ^ # % % % % % % % / % % % % % % % . ",
+". % ( _ : < [ } * } | 1 2 3 ( % % % % % % % 4 5 4 % % % % % % . ",
+". 6 6 7 8 9 0 a * b c d e 7 6 6 % % % % % % f g h % % % % % % . ",
+". * * * * * * * * * * * * * * * % % % % % % % i % % % % % % % . ",
+". * * * * * * * * * * * * * * * % % % % % % % % % % % % % % % . ",
+". j j k l m n o * p q r s k j j % % % % % % % % % % t u % % % . ",
+". % v w ' x y & * & z A ] B C % % % / D E % % % % F G # % % % . ",
+". 5 H : I ! % & * & % ! J 2 K L % % E M N % % % % % O P % % % . ",
+". Q R S $ % % & * & % % $ 5 T U % % E # V % % % % % % % % % % . ",
+". % % % % % % % % % % % % % % % % % % % % % % % i i % % % % % . ",
+". % % % % % % % % % % % % % % % % % % % % % % % W W % % % % % . ",
+". % % % % % % % X % % % % % % % % % % % % % % % % % % % % % % . ",
+". % % % % % Y Z ` .Y % % % % % % % % % % % % % % % % % % % % . ",
+". % % % % % % ..+.@.% % % % % % % % % % % % % % % % % % % % % . ",
+". % % % % % #.M +.M $.% % % % % % % % % % % %.&.%.% % % % % % . ",
+". % % % % % % *.=.-.% % % % % % % % % % % % ;.>.;.% % % % % % . ",
+". % % % % % % &.% &.% % % % % % % % % % % % % ,.% % % % % % % . ",
+". % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % . ",
+". % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
diff --git a/Source/Core/DolphinWX/resources/Flag_Russia.xpm b/Source/Core/DolphinWX/resources/Flag_Russia.xpm
new file mode 100644
index 0000000000..cf6b646d62
--- /dev/null
+++ b/Source/Core/DolphinWX/resources/Flag_Russia.xpm
@@ -0,0 +1,43 @@
+/* XPM */
+static const char * Flag_Russia_xpm[] = {
+"96 32 7 1",
+" c None",
+". c #000000",
+"+ c #FFFFFF",
+"@ c #AABDE1",
+"# c #0039A6",
+"$ c #8E304B",
+"% c #D52B1E",
+" ",
+" ",
+" ",
+" ",
+"................................ ",
+".++++++++++++++++++++++++++++++. ",
+".++++++++++++++++++++++++++++++. ",
+".++++++++++++++++++++++++++++++. ",
+".++++++++++++++++++++++++++++++. ",
+".++++++++++++++++++++++++++++++. ",
+".++++++++++++++++++++++++++++++. ",
+".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ",
+".##############################. ",
+".##############################. ",
+".##############################. ",
+".##############################. ",
+".##############################. ",
+".##############################. ",
+".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%. ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%. ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%. ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%. ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%. ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%. ",
+"................................ ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-25 03:05:35 +0000