Skip to content

Y
ygopro-core
Commit 1f3749aa authored by Chrono-Genex's avatar Chrono-Genex Committed by GitHub
Browse files
Options

fix move_to_field (#448)

parent 923c6699
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
operations.cpp
View file @ 1f3749aa
...@@ -4444,9 +4444,10 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret, ...@@ -4444,9 +4444,10 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
if(is_location_useable(playerid, LOCATION_PZONE, 1)) if(is_location_useable(playerid, LOCATION_PZONE, 1))
flag |= 0x1u << (core.duel_rule >= 4 ? 12 : 15); flag |= 0x1u << (core.duel_rule >= 4 ? 12 : 15);
if(!flag) { if(!flag) {
core.units.begin()->step = 3;
if(target->current.location != LOCATION_GRAVE) if(target->current.location != LOCATION_GRAVE)
send_to(target, 0, REASON_RULE, PLAYER_NONE, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP); send_to(target, 0, REASON_RULE, PLAYER_NONE, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP);
return TRUE; return FALSE;
} }
if(move_player != playerid) if(move_player != playerid)
flag = flag << 16; flag = flag << 16;
...@@ -4466,9 +4467,10 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret, ...@@ -4466,9 +4467,10 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
return FALSE; return FALSE;
} }
if(ct <= 0) { if(ct <= 0) {
core.units.begin()->step = 3;
if(target->current.location != LOCATION_GRAVE) if(target->current.location != LOCATION_GRAVE)
send_to(target, 0, REASON_RULE, PLAYER_NONE, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP); send_to(target, 0, REASON_RULE, PLAYER_NONE, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP);
return TRUE; return FALSE;
} }
if((zone & zone - 1) == 0) { if((zone & zone - 1) == 0) {
for(uint8 seq = 0; seq < 8; seq++) { for(uint8 seq = 0; seq < 8; seq++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment