Skip to content

Y
ygopro
Commit 6defb73f authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

Merge pull request #724 from sidschingis/patch-1 

fix
parents 63b5ad25 e360544c
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
ocgcore/operations.cpp
View file @ 6defb73f
...@@ -3325,7 +3325,12 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret ...@@ -3325,7 +3325,12 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
target->overlay_target->xyz_remove(target); target->overlay_target->xyz_remove(target);
move_card(playerid, target, location, target->temp.sequence); move_card(playerid, target, location, target->temp.sequence);
target->current.position = returns.ivalue[0]; target->current.position = returns.ivalue[0];
target->set_status(STATUS_LEAVE_CONFIRMED | STATUS_ACTIVATED, FALSE); if ((target->get_type() & TYPE_TRAPMONSTER) ||
((target->get_type() & TYPE_TRAP) && (target->current.location == LOCATION_MZONE) && (location == LOCATION_SZONE))
)
target->set_status(STATUS_LEAVE_CONFIRMED, FALSE);
else
target->set_status(STATUS_LEAVE_CONFIRMED | STATUS_ACTIVATED, FALSE);
pduel->write_buffer32(target->get_info_location()); pduel->write_buffer32(target->get_info_location());
pduel->write_buffer32(target->current.reason); pduel->write_buffer32(target->current.reason);
if((target->current.location != LOCATION_MZONE)) { if((target->current.location != LOCATION_MZONE)) {
......
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