Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
R
rd-ygopro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
苍蓝
rd-ygopro
Commits
4679ea4e
Commit
4679ea4e
authored
Dec 24, 2018
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'multi_language_fh'
parents
e79ee467
956dc60b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
5 deletions
+55
-5
gframe/event_handler.cpp
gframe/event_handler.cpp
+10
-0
gframe/game.cpp
gframe/game.cpp
+29
-5
gframe/image_manager.cpp
gframe/image_manager.cpp
+16
-0
No files found.
gframe/event_handler.cpp
View file @
4679ea4e
...
@@ -1975,6 +1975,16 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
...
@@ -1975,6 +1975,16 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
}
}
break
;
break
;
}
}
case
irr
:
:
gui
::
EGET_COMBO_BOX_CHANGED
:
{
switch
(
id
)
{
case
COMBOBOX_LOCALE
:
{
myswprintf
(
mainGame
->
gameConf
.
locale
,
L"%ls"
,
mainGame
->
cbLocale
->
getItem
(
mainGame
->
cbLocale
->
getSelected
()));
mainGame
->
SaveConfig
();
break
;
}
}
break
;
}
case
irr
:
:
gui
::
EGET_EDITBOX_ENTER
:
{
case
irr
:
:
gui
::
EGET_EDITBOX_ENTER
:
{
switch
(
id
)
{
switch
(
id
)
{
case
EDITBOX_CHAT
:
{
case
EDITBOX_CHAT
:
{
...
...
gframe/game.cpp
View file @
4679ea4e
...
@@ -1383,9 +1383,36 @@ void Game::LoadConfig() {
...
@@ -1383,9 +1383,36 @@ void Game::LoadConfig() {
}
}
}
}
fclose
(
fp_user
);
fclose
(
fp_user
);
}
else
{
}
else
#else // YGOPRO_COMPAT_MYCARD
if
(
!
gameConf
.
locale
||
wcslen
(
gameConf
.
locale
)
<=
0
)
#endif
{
unsigned
int
lcid
=
0
;
#ifdef _WIN32
#ifdef _WIN32
unsigned
int
lcid
=
((
unsigned
int
)
GetSystemDefaultLangID
())
&
0xff
;
lcid
=
((
unsigned
int
)
GetSystemDefaultLangID
())
&
0xff
;
#else
char
*
locale_str
=
getenv
(
"LANG"
);
if
(
locale_str
)
{
if
(
strstr
(
locale_str
,
"zh"
))
lcid
=
0x04
;
else
if
(
strstr
(
locale_str
,
"en"
))
lcid
=
0x09
;
else
if
(
strstr
(
locale_str
,
"es"
))
lcid
=
0x0a
;
else
if
(
strstr
(
locale_str
,
"ja"
))
lcid
=
0x11
;
else
if
(
strstr
(
locale_str
,
"ko"
))
lcid
=
0x12
;
else
if
(
strstr
(
locale_str
,
"pt"
))
lcid
=
0x16
;
}
#endif
switch
(
lcid
)
{
switch
(
lcid
)
{
case
0x04
:
{
case
0x04
:
{
myswprintf
(
mainGame
->
gameConf
.
locale
,
L"%ls"
,
L"zh-CN"
);
myswprintf
(
mainGame
->
gameConf
.
locale
,
L"%ls"
,
L"zh-CN"
);
...
@@ -1408,10 +1435,7 @@ void Game::LoadConfig() {
...
@@ -1408,10 +1435,7 @@ void Game::LoadConfig() {
break
;
break
;
}
}
}
}
#endif
//SaveConfig();
}
}
#endif //YGOPRO_COMPAT_MYCARD
}
}
void
Game
::
SaveConfig
()
{
void
Game
::
SaveConfig
()
{
#ifdef YGOPRO_COMPAT_MYCARD
#ifdef YGOPRO_COMPAT_MYCARD
...
...
gframe/image_manager.cpp
View file @
4679ea4e
...
@@ -358,6 +358,10 @@ irr::video::ITexture* ImageManager::GetTexture(int code, bool fit) {
...
@@ -358,6 +358,10 @@ irr::video::ITexture* ImageManager::GetTexture(int code, bool fit) {
sprintf
(
file
,
"pics/%d.png"
,
code
);
sprintf
(
file
,
"pics/%d.png"
,
code
);
img
=
GetTextureFromFile
(
file
,
width
,
height
);
img
=
GetTextureFromFile
(
file
,
width
,
height
);
}
}
if
(
img
==
NULL
)
{
sprintf
(
file
,
mainGame
->
GetLocaleDir
(
"pics/%d.jpg"
),
code
);
img
=
GetTextureFromFile
(
file
,
CARD_IMG_WIDTH
,
CARD_IMG_HEIGHT
);
}
if
(
img
==
NULL
)
{
if
(
img
==
NULL
)
{
sprintf
(
file
,
"pics/%d.jpg"
,
code
);
sprintf
(
file
,
"pics/%d.jpg"
,
code
);
img
=
GetTextureFromFile
(
file
,
width
,
height
);
img
=
GetTextureFromFile
(
file
,
width
,
height
);
...
@@ -404,6 +408,10 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
...
@@ -404,6 +408,10 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
sprintf
(
file
,
"pics/thumbnail/%d.jpg"
,
code
);
sprintf
(
file
,
"pics/thumbnail/%d.jpg"
,
code
);
img
=
GetTextureFromFile
(
file
,
width
,
height
);
img
=
GetTextureFromFile
(
file
,
width
,
height
);
}
}
if
(
img
==
NULL
)
{
sprintf
(
file
,
mainGame
->
GetLocaleDir
(
"pics/thumbnail/%d.jpg"
),
code
);
img
=
GetTextureFromFile
(
file
,
CARD_THUMB_WIDTH
,
CARD_THUMB_HEIGHT
);
}
if
(
img
==
NULL
&&
mainGame
->
gameConf
.
use_image_scale
)
{
if
(
img
==
NULL
&&
mainGame
->
gameConf
.
use_image_scale
)
{
sprintf
(
file
,
"pics/%d.png"
,
code
);
sprintf
(
file
,
"pics/%d.png"
,
code
);
img
=
GetTextureExpansions
(
file
,
width
,
height
);
img
=
GetTextureExpansions
(
file
,
width
,
height
);
...
@@ -456,6 +464,14 @@ irr::video::ITexture* ImageManager::GetTextureField(int code) {
...
@@ -456,6 +464,14 @@ irr::video::ITexture* ImageManager::GetTextureField(int code) {
sprintf
(
file
,
mainGame
->
GetLocaleDir
(
"pics/field/%d.jpg"
),
code
);
sprintf
(
file
,
mainGame
->
GetLocaleDir
(
"pics/field/%d.jpg"
),
code
);
img
=
GetTextureFromFile
(
file
,
512
*
mainGame
->
xScale
,
512
*
mainGame
->
yScale
);
img
=
GetTextureFromFile
(
file
,
512
*
mainGame
->
xScale
,
512
*
mainGame
->
yScale
);
}
}
if
(
img
==
NULL
)
{
sprintf
(
file
,
mainGame
->
GetLocaleDir
(
"pics/field/%d.png"
),
code
);
img
=
GetTextureFromFile
(
file
,
512
,
512
);
}
if
(
img
==
NULL
)
{
sprintf
(
file
,
mainGame
->
GetLocaleDir
(
"pics/field/%d.jpg"
),
code
);
img
=
GetTextureFromFile
(
file
,
512
,
512
);
}
if
(
img
==
NULL
)
{
if
(
img
==
NULL
)
{
sprintf
(
file
,
"pics/field/%d.png"
,
code
);
sprintf
(
file
,
"pics/field/%d.png"
,
code
);
img
=
GetTextureFromFile
(
file
,
512
*
mainGame
->
xScale
,
512
*
mainGame
->
yScale
);
img
=
GetTextureFromFile
(
file
,
512
*
mainGame
->
xScale
,
512
*
mainGame
->
yScale
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment