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
43370617
Commit
43370617
authored
Jan 04, 2017
by
独孤朲
Committed by
GitHub
Jan 04, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1906 from mercury233/patch-2
update announce card dialog
parents
f1a7cfe6
038930e5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
4 deletions
+21
-4
gframe/client_field.cpp
gframe/client_field.cpp
+14
-4
gframe/event_handler.cpp
gframe/event_handler.cpp
+7
-0
No files found.
gframe/client_field.cpp
View file @
43370617
...
@@ -1500,8 +1500,13 @@ void ClientField::UpdateDeclarableCodeType(bool enter) {
...
@@ -1500,8 +1500,13 @@ void ClientField::UpdateDeclarableCodeType(bool enter) {
auto
cp
=
dataManager
.
GetCodePointer
(
cit
->
first
);
//verified by _strings
auto
cp
=
dataManager
.
GetCodePointer
(
cit
->
first
);
//verified by _strings
//datas.alias can be double card names or alias
//datas.alias can be double card names or alias
if
(
is_declarable
(
cp
->
second
,
declarable_type
))
{
if
(
is_declarable
(
cp
->
second
,
declarable_type
))
{
mainGame
->
lstANCard
->
addItem
(
cit
->
second
.
name
);
if
(
wcscmp
(
pname
,
cit
->
second
.
name
)
==
0
)
{
//exact match
ancard
.
push_back
(
cit
->
first
);
mainGame
->
lstANCard
->
insertItem
(
0
,
cit
->
second
.
name
,
-
1
);
ancard
.
insert
(
ancard
.
begin
(),
cit
->
first
);
}
else
{
mainGame
->
lstANCard
->
addItem
(
cit
->
second
.
name
);
ancard
.
push_back
(
cit
->
first
);
}
}
}
}
}
}
}
...
@@ -1527,8 +1532,13 @@ void ClientField::UpdateDeclarableCodeOpcode(bool enter) {
...
@@ -1527,8 +1532,13 @@ void ClientField::UpdateDeclarableCodeOpcode(bool enter) {
auto
cp
=
dataManager
.
GetCodePointer
(
cit
->
first
);
//verified by _strings
auto
cp
=
dataManager
.
GetCodePointer
(
cit
->
first
);
//verified by _strings
//datas.alias can be double card names or alias
//datas.alias can be double card names or alias
if
(
is_declarable
(
cp
->
second
,
opcode
))
{
if
(
is_declarable
(
cp
->
second
,
opcode
))
{
mainGame
->
lstANCard
->
addItem
(
cit
->
second
.
name
);
if
(
wcscmp
(
pname
,
cit
->
second
.
name
)
==
0
)
{
//exact match
ancard
.
push_back
(
cit
->
first
);
mainGame
->
lstANCard
->
insertItem
(
0
,
cit
->
second
.
name
,
-
1
);
ancard
.
insert
(
ancard
.
begin
(),
cit
->
first
);
}
else
{
mainGame
->
lstANCard
->
addItem
(
cit
->
second
.
name
);
ancard
.
push_back
(
cit
->
first
);
}
}
}
}
}
}
}
...
...
gframe/event_handler.cpp
View file @
43370617
...
@@ -891,6 +891,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
...
@@ -891,6 +891,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
}
}
break
;
break
;
}
}
case
LISTBOX_ANCARD
:
{
int
sel
=
mainGame
->
lstANCard
->
getSelected
();
if
(
sel
!=
-
1
)
{
mainGame
->
ShowCardInfo
(
ancard
[
sel
]);
}
break
;
}
}
}
break
;
break
;
}
}
...
...
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