Skip to content

Y
ygopro-core
Commit b3daf7e0 authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch 'wind/patch-1' into develop

parents 2db36f2f 92f8ff07
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
processor.cpp
View file @ b3daf7e0
...@@ -3049,13 +3049,13 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3049,13 +3049,13 @@ int32 field::process_battle_command(uint16 step) {
core.attacker->current.reason_player = core.attack_target->current.controler; core.attacker->current.reason_player = core.attack_target->current.controler;
uint32 dest = LOCATION_GRAVE; uint32 dest = LOCATION_GRAVE;
uint32 seq = 0; uint32 seq = 0;
core.attacker->set_status(STATUS_DESTROY_CONFIRMED, TRUE);
if((peffect = core.attack_target->is_affected_by_effect(EFFECT_BATTLE_DESTROY_REDIRECT)) && (core.attacker->data.type & TYPE_MONSTER)) { if((peffect = core.attack_target->is_affected_by_effect(EFFECT_BATTLE_DESTROY_REDIRECT)) && (core.attacker->data.type & TYPE_MONSTER)) {
dest = peffect->get_value(core.attacker); dest = peffect->get_value(core.attacker);
seq = dest >> 16; seq = dest >> 16;
dest &= 0xffff; dest &= 0xffff;
} }
core.attacker->sendto_param.set(core.attacker->owner, POS_FACEUP, dest, seq); core.attacker->sendto_param.set(core.attacker->owner, POS_FACEUP, dest, seq);
core.attacker->set_status(STATUS_DESTROY_CONFIRMED, TRUE);
} }
if(core.attack_target && core.attack_target->is_status(STATUS_BATTLE_RESULT) if(core.attack_target && core.attack_target->is_status(STATUS_BATTLE_RESULT)
&& core.attack_target->current.location == LOCATION_MZONE && core.attack_target->fieldid_r == core.pre_field[1]) { && core.attack_target->current.location == LOCATION_MZONE && core.attack_target->fieldid_r == core.pre_field[1]) {
......
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