Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-core
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
xiaoye
ygopro-core
Commits
03bb69ae
Commit
03bb69ae
authored
Jul 27, 2018
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
5a2958c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
operations.cpp
operations.cpp
+1
-1
processor.cpp
processor.cpp
+0
-1
No files found.
operations.cpp
View file @
03bb69ae
...
@@ -4329,6 +4329,7 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
...
@@ -4329,6 +4329,7 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
&& !(peffect && (peffect->value & TYPE_TRAP)) && ret != 2)
&& !(peffect && (peffect->value & TYPE_TRAP)) && ret != 2)
resetflag |= RESET_MSCHANGE;
resetflag |= RESET_MSCHANGE;
target->reset(resetflag, RESET_EVENT);
target->reset(resetflag, RESET_EVENT);
target->clear_card_target();
}
}
if(!(target->current.location & LOCATION_ONFIELD))
if(!(target->current.location & LOCATION_ONFIELD))
target->clear_relate_effect();
target->clear_relate_effect();
...
@@ -4405,7 +4406,6 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
...
@@ -4405,7 +4406,6 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
}
}
if((target->previous.location == LOCATION_SZONE) && target->equiping_target)
if((target->previous.location == LOCATION_SZONE) && target->equiping_target)
target->unequip();
target->unequip();
target
->
clear_card_target
();
if(target->current.location == LOCATION_MZONE) {
if(target->current.location == LOCATION_MZONE) {
effect_set eset;
effect_set eset;
filter_player_effect(0, EFFECT_MUST_USE_MZONE, &eset, FALSE);
filter_player_effect(0, EFFECT_MUST_USE_MZONE, &eset, FALSE);
...
...
processor.cpp
View file @
03bb69ae
...
@@ -1998,7 +1998,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
...
@@ -1998,7 +1998,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
core
.
ntpchain
.
clear
();
core
.
ntpchain
.
clear
();
if
(
!
core
.
quick_f_chain
.
size
())
if
(
!
core
.
quick_f_chain
.
size
())
return
FALSE
;
return
FALSE
;
bool
act
=
true
;
for
(
auto
ifit
=
core
.
quick_f_chain
.
begin
();
ifit
!=
core
.
quick_f_chain
.
end
();
++
ifit
)
{
for
(
auto
ifit
=
core
.
quick_f_chain
.
begin
();
ifit
!=
core
.
quick_f_chain
.
end
();
++
ifit
)
{
effect
*
peffect
=
ifit
->
first
;
effect
*
peffect
=
ifit
->
first
;
card
*
phandler
=
peffect
->
get_handler
();
card
*
phandler
=
peffect
->
get_handler
();
...
...
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