Commit d7aef0d8 authored by Nanahira's avatar Nanahira Committed by GitHub

Merge pull request #18 from mycard/develop-8888

Develop 8888
parents 0cf48876 19c7c691
...@@ -2276,25 +2276,6 @@ void card::reset(uint32 id, uint32 reset_type) { ...@@ -2276,25 +2276,6 @@ void card::reset(uint32 id, uint32 reset_type) {
cmit = counters.erase(cmit); cmit = counters.erase(cmit);
} }
} }
if(id & RESET_TURN_SET) {
#ifdef _IRR_ANDROID_PLATFORM_
effect* peffect = std::get<1>(refresh_control_status());
#else
effect* peffect = std::get<effect*>(refresh_control_status());
#endif
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();) {
auto rm = i++; auto rm = i++;
......
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