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
ea67cf7e
Commit
ea67cf7e
authored
Mar 29, 2017
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update Duel.ReturnToField
parent
d3a9bf14
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
libduel.cpp
libduel.cpp
+5
-2
operations.cpp
operations.cpp
+0
-4
No files found.
libduel.cpp
View file @
ea67cf7e
...
@@ -638,13 +638,16 @@ int32 scriptlib::duel_return_to_field(lua_State *L) {
...
@@ -638,13 +638,16 @@ int32 scriptlib::duel_return_to_field(lua_State *L) {
if
(
!
(
pcard
->
current
.
reason
&
REASON_TEMPORARY
))
if
(
!
(
pcard
->
current
.
reason
&
REASON_TEMPORARY
))
return
0
;
return
0
;
int32
pos
=
pcard
->
previous
.
position
;
int32
pos
=
pcard
->
previous
.
position
;
if
(
lua_gettop
(
L
)
>
1
)
if
(
lua_gettop
(
L
)
>
=
2
)
pos
=
lua_tointeger
(
L
,
2
);
pos
=
lua_tointeger
(
L
,
2
);
uint32
zone
=
0xff
;
if
(
lua_gettop
(
L
)
>=
3
)
zone
=
lua_tointeger
(
L
,
3
);
duel
*
pduel
=
pcard
->
pduel
;
duel
*
pduel
=
pcard
->
pduel
;
pcard
->
enable_field_effect
(
false
);
pcard
->
enable_field_effect
(
false
);
pduel
->
game_field
->
adjust_instant
();
pduel
->
game_field
->
adjust_instant
();
pduel
->
game_field
->
refresh_location_info_instant
();
pduel
->
game_field
->
refresh_location_info_instant
();
pduel
->
game_field
->
move_to_field
(
pcard
,
pcard
->
previous
.
controler
,
pcard
->
previous
.
controler
,
pcard
->
previous
.
location
,
pos
,
TRUE
,
1
);
pduel
->
game_field
->
move_to_field
(
pcard
,
pcard
->
previous
.
controler
,
pcard
->
previous
.
controler
,
pcard
->
previous
.
location
,
pos
,
TRUE
,
1
,
0
,
zone
);
pduel
->
game_field
->
core
.
subunits
.
back
().
type
=
PROCESSOR_MOVETOFIELD_S
;
pduel
->
game_field
->
core
.
subunits
.
back
().
type
=
PROCESSOR_MOVETOFIELD_S
;
return
lua_yield
(
L
,
0
);
return
lua_yield
(
L
,
0
);
}
}
...
...
operations.cpp
View file @
ea67cf7e
...
@@ -3891,10 +3891,6 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
...
@@ -3891,10 +3891,6 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
}
}
if
(
ct
<=
0
)
if
(
ct
<=
0
)
return
TRUE
;
return
TRUE
;
if
(
ret
&&
is_location_useable
(
playerid
,
location
,
target
->
previous
.
sequence
))
{
returns
.
bvalue
[
2
]
=
target
->
previous
.
sequence
;
return
FALSE
;
}
if
(
move_player
==
playerid
)
{
if
(
move_player
==
playerid
)
{
if
(
location
==
LOCATION_SZONE
)
if
(
location
==
LOCATION_SZONE
)
flag
=
((
flag
&
0xff
)
<<
8
)
|
0xffff00ff
;
flag
=
((
flag
&
0xff
)
<<
8
)
|
0xffff00ff
;
...
...
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