Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
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
REIKAI
ygopro
Commits
da811668
Commit
da811668
authored
Jun 29, 2017
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
49669fb4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
13 deletions
+9
-13
gframe/deck_con.cpp
gframe/deck_con.cpp
+0
-7
gframe/event_handler.cpp
gframe/event_handler.cpp
+6
-5
gframe/game.cpp
gframe/game.cpp
+3
-1
No files found.
gframe/deck_con.cpp
View file @
da811668
...
@@ -459,13 +459,6 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -459,13 +459,6 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
}
}
}
}
}
}
case
irr
:
:
gui
::
EGET_CHECKBOX_CHANGED
:
{
case
CHECKBOX_ENABLE_MUSIC
:
{
if
(
!
mainGame
->
chkEnableMusic
->
isChecked
())
mainGame
->
engineMusic
->
stopAllSounds
();
break
;
}
}
default:
break
;
default:
break
;
}
}
break
;
break
;
...
...
gframe/event_handler.cpp
View file @
da811668
...
@@ -888,11 +888,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
...
@@ -888,11 +888,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
}
}
break
;
break
;
}
}
case
CHECKBOX_ENABLE_MUSIC
:
{
if
(
!
mainGame
->
chkEnableMusic
->
isChecked
())
mainGame
->
engineMusic
->
stopAllSounds
();
break
;
}
}
}
break
;
break
;
}
}
...
@@ -1973,6 +1968,12 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
...
@@ -1973,6 +1968,12 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
return
true
;
return
true
;
break
;
break
;
}
}
case
CHECKBOX_ENABLE_MUSIC
:
{
if
(
!
mainGame
->
chkEnableMusic
->
isChecked
())
mainGame
->
engineMusic
->
stopAllSounds
();
return
true
;
break
;
}
}
}
break
;
break
;
}
}
...
...
gframe/game.cpp
View file @
da811668
...
@@ -1158,6 +1158,8 @@ void Game::PlayBGM() {
...
@@ -1158,6 +1158,8 @@ void Game::PlayBGM() {
is_playing
=
false
;
is_playing
=
false
;
if
(
!
is_playing
)
{
if
(
!
is_playing
)
{
int
count
=
BGMList
.
size
();
int
count
=
BGMList
.
size
();
if
(
count
<=
0
)
return
;
int
bgm
=
(
gameConf
.
BGM_index
>=
0
)
?
gameConf
.
BGM_index
:
rand
()
%
count
;
int
bgm
=
(
gameConf
.
BGM_index
>=
0
)
?
gameConf
.
BGM_index
:
rand
()
%
count
;
auto
name
=
BGMList
[
bgm
].
c_str
();
auto
name
=
BGMList
[
bgm
].
c_str
();
wchar_t
fname
[
256
];
wchar_t
fname
[
256
];
...
@@ -1184,7 +1186,7 @@ void Game::ShowCardInfo(int code) {
...
@@ -1184,7 +1186,7 @@ void Game::ShowCardInfo(int code) {
else
myswprintf
(
formatBuffer
,
L"%ls[%08d]"
,
dataManager
.
GetName
(
code
),
code
);
else
myswprintf
(
formatBuffer
,
L"%ls[%08d]"
,
dataManager
.
GetName
(
code
),
code
);
stName
->
setText
(
formatBuffer
);
stName
->
setText
(
formatBuffer
);
int
offset
=
0
;
int
offset
=
0
;
if
(
!
gameConf
.
chkHideSetname
)
{
if
(
!
mainGame
->
chkHideSetname
->
isChecked
()
)
{
unsigned
long
long
sc
=
cd
.
setcode
;
unsigned
long
long
sc
=
cd
.
setcode
;
if
(
cd
.
alias
)
{
if
(
cd
.
alias
)
{
auto
aptr
=
dataManager
.
_datas
.
find
(
cd
.
alias
);
auto
aptr
=
dataManager
.
_datas
.
find
(
cd
.
alias
);
...
...
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