Skip to content

Y
ygopro-core
Commit c1a9814f authored by nekrozar's avatar nekrozar Committed by DailyShana
Browse files
Options

merge #45

parent aada13bd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
card.cpp
View file @ c1a9814f
...@@ -1475,9 +1475,9 @@ void card::reset(uint32 id, uint32 reset_type) { ...@@ -1475,9 +1475,9 @@ void card::reset(uint32 id, uint32 reset_type) {
if (rrm->second & 0xffff0000 & id) if (rrm->second & 0xffff0000 & id)
relations.erase(rrm); relations.erase(rrm);
} }
if(id & 0x47c0000) if(id & 0xc7c0000)
clear_relate_effect(); clear_relate_effect();
if(id & 0x5fc0000) { if(id & 0xdfc0000) {
indestructable_effects.clear(); indestructable_effects.clear();
announced_cards.clear(); announced_cards.clear();
attacked_cards.clear(); attacked_cards.clear();
...@@ -1485,7 +1485,7 @@ void card::reset(uint32 id, uint32 reset_type) { ...@@ -1485,7 +1485,7 @@ void card::reset(uint32 id, uint32 reset_type) {
attacked_count = 0; attacked_count = 0;
attack_all_target = TRUE; attack_all_target = TRUE;
} }
if(id & 0x5fe0000) { if(id & 0xdfe0000) {
battled_cards.clear(); battled_cards.clear();
reset_effect_count(); reset_effect_count();
auto pr = field_effect.equal_range(EFFECT_DISABLE_FIELD); auto pr = field_effect.equal_range(EFFECT_DISABLE_FIELD);
...@@ -1493,7 +1493,7 @@ void card::reset(uint32 id, uint32 reset_type) { ...@@ -1493,7 +1493,7 @@ void card::reset(uint32 id, uint32 reset_type) {
pr.first->second->value = 0; pr.first->second->value = 0;
set_status(STATUS_UNION, FALSE); set_status(STATUS_UNION, FALSE);
} }
if(id & 0x57e0000) { if(id & 0xd7e0000) {
counters.clear(); counters.clear();
for(auto cit = effect_target_owner.begin(); cit != effect_target_owner.end(); ++cit) for(auto cit = effect_target_owner.begin(); cit != effect_target_owner.end(); ++cit)
(*cit)->effect_target_cards.erase(this); (*cit)->effect_target_cards.erase(this);
......
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