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
2ef064f9
Commit
2ef064f9
authored
Dec 22, 2015
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
bd4c96c6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
field.cpp
field.cpp
+1
-3
operations.cpp
operations.cpp
+1
-1
No files found.
field.cpp
View file @
2ef064f9
...
...
@@ -173,18 +173,16 @@ void field::add_card(uint8 playerid, card* pcard, uint8 location, uint8 sequence
if
(
sequence
==
0
)
{
//deck top
player
[
playerid
].
list_main
.
push_back
(
pcard
);
pcard
->
current
.
sequence
=
player
[
playerid
].
list_main
.
size
()
-
1
;
pcard
->
current
.
position
=
POS_FACEUP_ATTACK
;
}
else
if
(
sequence
==
1
)
{
//deck button
player
[
playerid
].
list_main
.
insert
(
player
[
playerid
].
list_main
.
begin
(),
pcard
);
reset_sequence
(
playerid
,
LOCATION_DECK
);
pcard
->
current
.
position
=
POS_FACEDOWN
;
}
else
{
//deck top & shuffle
player
[
playerid
].
list_main
.
push_back
(
pcard
);
pcard
->
current
.
sequence
=
player
[
playerid
].
list_main
.
size
()
-
1
;
if
(
!
core
.
shuffle_check_disabled
)
core
.
shuffle_deck_check
[
playerid
]
=
TRUE
;
pcard
->
current
.
position
=
POS_FACEDOWN
;
}
pcard
->
operation_param
=
(
pcard
->
operation_param
&
0x00ffffff
)
|
(
POS_FACEDOWN
<<
24
);
break
;
}
case
LOCATION_HAND
:
{
...
...
operations.cpp
View file @
2ef064f9
...
...
@@ -336,7 +336,7 @@ int32 field::draw(uint16 step, effect* reason_effect, uint32 reason, uint8 reaso
add_card
(
playerid
,
pcard
,
LOCATION_HAND
,
0
);
pcard
->
enable_field_effect
(
TRUE
);
effect
*
pub
=
pcard
->
is_affected_by_effect
(
EFFECT_PUBLIC
);
if
(
pub
||
pcard
->
current
.
position
==
POS_FACEUP_ATTACK
)
if
(
pub
)
public_count
++
;
pcard
->
current
.
position
=
pub
?
POS_FACEUP
:
POS_FACEDOWN
;
cv
.
push_back
(
pcard
);
...
...
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