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
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
MyCard
ygopro
Commits
0ab4dbe8
Commit
0ab4dbe8
authored
Mar 20, 2016
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix MSG_SELECT_SUM
parent
259d3ca0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
gframe/client_field.cpp
gframe/client_field.cpp
+4
-1
gframe/client_field.h
gframe/client_field.h
+1
-1
gframe/duelclient.cpp
gframe/duelclient.cpp
+1
-2
No files found.
gframe/client_field.cpp
View file @
0ab4dbe8
...
...
@@ -1100,12 +1100,13 @@ void ClientField::FadeCard(ClientCard * pcard, int alpha, int frame) {
pcard
->
is_fading
=
true
;
pcard
->
aniFrame
=
frame
;
}
void
ClientField
::
ShowSelectSum
(
bool
panelmode
)
{
bool
ClientField
::
ShowSelectSum
(
bool
panelmode
)
{
if
(
panelmode
)
{
if
(
CheckSelectSum
())
{
if
(
selectsum_cards
.
size
()
==
0
||
selectable_cards
.
size
()
==
0
)
{
SetResponseSelectedCards
();
mainGame
->
HideElement
(
mainGame
->
wCardSelect
,
true
);
return
true
;
}
else
{
select_ready
=
true
;
mainGame
->
wCardSelect
->
setVisible
(
false
);
...
...
@@ -1121,6 +1122,7 @@ void ClientField::ShowSelectSum(bool panelmode) {
if
(
selectsum_cards
.
size
()
==
0
||
selectable_cards
.
size
()
==
0
)
{
SetResponseSelectedCards
();
DuelClient
::
SendResponse
();
return
true
;
}
else
{
select_ready
=
true
;
wchar_t
wbuf
[
256
],
*
pwbuf
=
wbuf
;
...
...
@@ -1133,6 +1135,7 @@ void ClientField::ShowSelectSum(bool panelmode) {
}
else
select_ready
=
false
;
}
return
false
;
}
bool
ClientField
::
CheckSelectSum
()
{
std
::
set
<
ClientCard
*>
selable
;
...
...
gframe/client_field.h
View file @
0ab4dbe8
...
...
@@ -96,7 +96,7 @@ public:
void
GetCardLocation
(
ClientCard
*
pcard
,
irr
::
core
::
vector3df
*
t
,
irr
::
core
::
vector3df
*
r
,
bool
setTrans
=
false
);
void
MoveCard
(
ClientCard
*
pcard
,
int
frame
);
void
FadeCard
(
ClientCard
*
pcard
,
int
alpha
,
int
frame
);
void
ShowSelectSum
(
bool
panelmode
);
bool
ShowSelectSum
(
bool
panelmode
);
bool
CheckSelectSum
();
bool
check_min
(
std
::
set
<
ClientCard
*>&
left
,
std
::
set
<
ClientCard
*>::
iterator
index
,
int
min
,
int
max
);
bool
check_sel_sum_s
(
const
std
::
set
<
ClientCard
*>&
left
,
int
index
,
int
acc
);
...
...
gframe/duelclient.cpp
View file @
0ab4dbe8
...
...
@@ -1470,8 +1470,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame
->
stHintMsg
->
setText
(
textBuffer
);
mainGame
->
stHintMsg
->
setVisible
(
true
);
}
mainGame
->
dField
.
ShowSelectSum
(
panelmode
);
return
false
;
return
mainGame
->
dField
.
ShowSelectSum
(
panelmode
);
}
case
MSG_SORT_CARD
:
case
MSG_SORT_CHAIN
:
{
...
...
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