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
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-core
Commits
225a846f
Commit
225a846f
authored
Jan 10, 2021
by
salix5
Committed by
GitHub
Jan 10, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #351 from Fluorohydride/patch-disable-field
fix EFFECT_DISABLE_FIELD
parents
abf1e6b1
55870040
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
card.cpp
card.cpp
+4
-2
processor.cpp
processor.cpp
+1
-1
No files found.
card.cpp
View file @
225a846f
...
...
@@ -1899,8 +1899,10 @@ void card::reset(uint32 id, uint32 reset_type) {
battled_cards
.
clear
();
reset_effect_count
();
auto
pr
=
field_effect
.
equal_range
(
EFFECT_DISABLE_FIELD
);
for
(;
pr
.
first
!=
pr
.
second
;
++
pr
.
first
)
pr
.
first
->
second
->
value
=
0
;
for
(;
pr
.
first
!=
pr
.
second
;
++
pr
.
first
){
if
(
!
pr
.
first
->
second
->
is_flag
(
EFFECT_FLAG_FUNC_VALUE
))
pr
.
first
->
second
->
value
=
0
;
}
}
if
(
id
&
(
RESET_TODECK
|
RESET_TOHAND
|
RESET_TOGRAVE
|
RESET_REMOVE
|
RESET_TEMP_REMOVE
|
RESET_OVERLAY
|
RESET_MSCHANGE
|
RESET_TOFIELD
|
RESET_TURN_SET
))
{
...
...
processor.cpp
View file @
225a846f
...
...
@@ -4538,7 +4538,7 @@ int32 field::refresh_location_info(uint16 step) {
filter_field_effect
(
EFFECT_DISABLE_FIELD
,
&
eset
);
for
(
int32
i
=
0
;
i
<
eset
.
size
();
++
i
)
{
uint32
value
=
eset
[
i
]
->
get_value
();
if
(
value
&&
!
eset
[
i
]
->
is_flag
(
EFFECT_FLAG_REPEAT
)
)
{
if
(
value
)
{
player
[
0
].
disabled_location
|=
value
&
0x1f7f
;
player
[
1
].
disabled_location
|=
(
value
>>
16
)
&
0x1f7f
;
}
else
...
...
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