Skip to content

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

Merge remote-tracking branch 'upstream/patch-control' into develop

parents 7c2de13c 03087edd
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 13 deletions
card.cpp
View file @ 0f54c82c
...@@ -2165,19 +2165,7 @@ void card::reset(uint32 id, uint32 reset_type) { ...@@ -2165,19 +2165,7 @@ void card::reset(uint32 id, uint32 reset_type) {
} }
} }
if(id & RESET_TURN_SET) { if(id & RESET_TURN_SET) {
effect* peffect = std::get<effect*>(refresh_control_status()); refresh_control_status();
if(peffect && (!(peffect->type & EFFECT_TYPE_SINGLE) || peffect->condition)) {
effect* new_effect = pduel->new_effect();
new_effect->id = peffect->id;
new_effect->owner = this;
new_effect->handler = this;
new_effect->type = EFFECT_TYPE_SINGLE;
new_effect->code = EFFECT_SET_CONTROL;
new_effect->value = current.controler;
new_effect->flag[0] = EFFECT_FLAG_CANNOT_DISABLE;
new_effect->reset_flag = RESET_EVENT | 0xec0000;
this->add_effect(new_effect);
}
} }
} }
for (auto i = indexer.begin(); i != indexer.end();) { for (auto i = indexer.begin(); i != indexer.end();) {
......
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