Commit fa84a630 authored by salix5's avatar salix5

Merge pull request #15 from DailyShana/patch-2

fix leave field redirect
parents d0fb5bb6 0db6d46d
...@@ -3125,7 +3125,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -3125,7 +3125,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
check_cb = 0; check_cb = 0;
if((dest & LOCATION_GRAVE) && pcard->is_affected_by_effect(EFFECT_TO_GRAVE_REDIRECT_CB)) if((dest & LOCATION_GRAVE) && pcard->is_affected_by_effect(EFFECT_TO_GRAVE_REDIRECT_CB))
check_cb = 1; check_cb = 1;
if((pcard->current.location & LOCATION_ONFIELD) && !pcard->is_status(STATUS_SUMMON_DISABLED)) { if((pcard->current.location & LOCATION_ONFIELD) && !pcard->is_status(STATUS_SUMMON_DISABLED) && !pcard->is_status(STATUS_ACTIVATE_DISABLED)) {
redirect = pcard->leave_field_redirect(pcard->current.reason); redirect = pcard->leave_field_redirect(pcard->current.reason);
redirect_seq = redirect >> 16; redirect_seq = redirect >> 16;
redirect &= 0xffff; redirect &= 0xffff;
......
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