Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
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-2pick
Commits
fa74957a
Commit
fa74957a
authored
Aug 10, 2015
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
7b059927
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
ocgcore/operations.cpp
ocgcore/operations.cpp
+12
-8
No files found.
ocgcore/operations.cpp
View file @
fa74957a
...
...
@@ -992,22 +992,27 @@ int32 field::control_adjust(uint16 step) {
pduel
->
write_buffer8
(
pcard1
->
current
.
sequence
);
pduel
->
write_buffer8
(
pcard1
->
current
.
position
);
}
core.operated_set.insert(cit1, core.control_adjust_set[0].end());
core.operated_set.insert(cit2, core.control_adjust_set[1].end());
card_set
*
adjust_set
=
new
card_set
;
core
.
units
.
begin
()
->
ptarget
=
(
group
*
)
adjust_set
;
adjust_set
->
insert
(
cit1
,
core
.
control_adjust_set
[
0
].
end
());
adjust_set
->
insert
(
cit2
,
core
.
control_adjust_set
[
1
].
end
());
return
FALSE
;
}
case
3
:
{
if(core.operated_set.size() == 0)
card_set
*
adjust_set
=
(
card_set
*
)
core
.
units
.
begin
()
->
ptarget
;
if
(
adjust_set
->
empty
())
return
FALSE
;
auto cit =
core.operated_set.
begin();
auto
cit
=
adjust_set
->
begin
();
card
*
pcard
=
*
cit
;
core.operated_set.
erase(cit);
adjust_set
->
erase
(
cit
);
pcard
->
reset
(
RESET_CONTROL
,
RESET_EVENT
);
move_to_field
(
pcard
,
1
-
pcard
->
current
.
controler
,
1
-
pcard
->
current
.
controler
,
LOCATION_MZONE
,
pcard
->
current
.
position
);
core
.
units
.
begin
()
->
step
=
2
;
return
FALSE
;
}
case
4
:
{
card_set
*
adjust_set
=
(
card_set
*
)
core
.
units
.
begin
()
->
ptarget
;
delete
adjust_set
;
core
.
control_adjust_set
[
0
].
insert
(
core
.
control_adjust_set
[
1
].
begin
(),
core
.
control_adjust_set
[
1
].
end
());
for
(
auto
cit
=
core
.
control_adjust_set
[
0
].
begin
();
cit
!=
core
.
control_adjust_set
[
0
].
end
();
++
cit
)
{
(
*
cit
)
->
filter_disable_related_cards
();
...
...
@@ -1039,10 +1044,9 @@ int32 field::self_destroy(uint16 step) {
}
case
1
:
{
core
.
self_destroy_set
.
clear
();
if(!(core.global_flag & GLOBALFLAG_SELF_TOGRAVE)) {
core.operated_set.clear();
core
.
operated_set
.
clear
();
if
(
!
(
core
.
global_flag
&
GLOBALFLAG_SELF_TOGRAVE
))
return
TRUE
;
}
core
.
units
.
begin
()
->
arg1
=
returns
.
ivalue
[
0
];
if
(
!
core
.
self_tograve_set
.
empty
())
send_to
(
&
core
.
self_tograve_set
,
0
,
REASON_EFFECT
,
PLAYER_NONE
,
PLAYER_NONE
,
LOCATION_GRAVE
,
0
,
POS_FACEUP
);
...
...
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