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
nanahira
ygopro-core
Commits
b6bed159
You need to sign in or sign up before continuing.
Commit
b6bed159
authored
Feb 25, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
workaround for android
parent
ba72536e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
1 deletion
+17
-1
.gitignore
.gitignore
+1
-0
card.cpp
card.cpp
+4
-0
field.cpp
field.cpp
+7
-1
processor.cpp
processor.cpp
+5
-0
No files found.
.gitignore
0 → 100644
View file @
b6bed159
.vscode*
card.cpp
View file @
b6bed159
...
@@ -2010,7 +2010,11 @@ void card::reset(uint32 id, uint32 reset_type) {
...
@@ -2010,7 +2010,11 @@ void card::reset(uint32 id, uint32 reset_type) {
}
}
}
}
if
(
id
&
RESET_TURN_SET
)
{
if
(
id
&
RESET_TURN_SET
)
{
#ifdef _IRR_ANDROID_PLATFORM_
effect
*
peffect
=
std
::
get
<
1
>
(
refresh_control_status
());
#else
effect
*
peffect
=
std
::
get
<
effect
*>
(
refresh_control_status
());
effect
*
peffect
=
std
::
get
<
effect
*>
(
refresh_control_status
());
#endif
if
(
peffect
&&
(
!
(
peffect
->
type
&
EFFECT_TYPE_SINGLE
)
||
peffect
->
condition
))
{
if
(
peffect
&&
(
!
(
peffect
->
type
&
EFFECT_TYPE_SINGLE
)
||
peffect
->
condition
))
{
effect
*
new_effect
=
pduel
->
new_effect
();
effect
*
new_effect
=
pduel
->
new_effect
();
new_effect
->
id
=
peffect
->
id
;
new_effect
->
id
=
peffect
->
id
;
...
...
field.cpp
View file @
b6bed159
...
@@ -523,7 +523,13 @@ void field::swap_card(card* pcard1, card* pcard2) {
...
@@ -523,7 +523,13 @@ void field::swap_card(card* pcard1, card* pcard2) {
return
swap_card
(
pcard1
,
pcard2
,
pcard1
->
current
.
sequence
,
pcard2
->
current
.
sequence
);
return
swap_card
(
pcard1
,
pcard2
,
pcard1
->
current
.
sequence
,
pcard2
->
current
.
sequence
);
}
}
void
field
::
set_control
(
card
*
pcard
,
uint8
playerid
,
uint16
reset_phase
,
uint8
reset_count
)
{
void
field
::
set_control
(
card
*
pcard
,
uint8
playerid
,
uint16
reset_phase
,
uint8
reset_count
)
{
if
((
core
.
remove_brainwashing
&&
pcard
->
is_affected_by_effect
(
EFFECT_REMOVE_BRAINWASHING
))
||
std
::
get
<
uint8
>
(
pcard
->
refresh_control_status
())
==
playerid
)
if
((
core
.
remove_brainwashing
&&
pcard
->
is_affected_by_effect
(
EFFECT_REMOVE_BRAINWASHING
))
||
#ifdef _IRR_ANDROID_PLATFORM_
std
::
get
<
0
>
(
pcard
->
refresh_control_status
())
#else
std
::
get
<
uint8
>
(
pcard
->
refresh_control_status
())
#endif
==
playerid
)
return
;
return
;
effect
*
peffect
=
pduel
->
new_effect
();
effect
*
peffect
=
pduel
->
new_effect
();
if
(
core
.
reason_effect
)
if
(
core
.
reason_effect
)
...
...
processor.cpp
View file @
b6bed159
...
@@ -4871,8 +4871,13 @@ int32 field::adjust_step(uint16 step) {
...
@@ -4871,8 +4871,13 @@ int32 field::adjust_step(uint16 step) {
if
(
!
pcard
)
continue
;
if
(
!
pcard
)
continue
;
uint8
cur
=
pcard
->
current
.
controler
;
uint8
cur
=
pcard
->
current
.
controler
;
auto
res
=
pcard
->
refresh_control_status
();
auto
res
=
pcard
->
refresh_control_status
();
#ifdef _IRR_ANDROID_PLATFORM_
uint8
ref
=
std
::
get
<
0
>
(
res
);
effect
*
peffect
=
std
::
get
<
1
>
(
res
);
#else
uint8
ref
=
std
::
get
<
uint8
>
(
res
);
uint8
ref
=
std
::
get
<
uint8
>
(
res
);
effect
*
peffect
=
std
::
get
<
effect
*>
(
res
);
effect
*
peffect
=
std
::
get
<
effect
*>
(
res
);
#endif
if
(
cur
!=
ref
&&
pcard
->
is_capable_change_control
())
{
if
(
cur
!=
ref
&&
pcard
->
is_capable_change_control
())
{
core
.
control_adjust_set
[
p
].
insert
(
pcard
);
core
.
control_adjust_set
[
p
].
insert
(
pcard
);
if
(
peffect
&&
(
!
(
peffect
->
type
&
EFFECT_TYPE_SINGLE
)
||
peffect
->
condition
))
if
(
peffect
&&
(
!
(
peffect
->
type
&
EFFECT_TYPE_SINGLE
)
||
peffect
->
condition
))
...
...
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