Skip to content

Y
ygopro-core
Commit 1e83f3db authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:Fluorohydride/ygopro-core

parents 76bbf1ed 650be64b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
card.cpp
View file @ 1e83f3db
...@@ -1975,7 +1975,7 @@ int32 card::copy_effect(uint32 code, uint32 reset, uint32 count) { ...@@ -1975,7 +1975,7 @@ int32 card::copy_effect(uint32 code, uint32 reset, uint32 count) {
for(auto& peffect : pduel->uncopy) for(auto& peffect : pduel->uncopy)
pduel->delete_effect(peffect); pduel->delete_effect(peffect);
pduel->uncopy.clear(); pduel->uncopy.clear();
if(!(data.type & TYPE_EFFECT)) { if((data.type & TYPE_MONSTER) && !(data.type & TYPE_EFFECT)) {
effect* peffect = pduel->new_effect(); effect* peffect = pduel->new_effect();
if(pduel->game_field->core.reason_effect) if(pduel->game_field->core.reason_effect)
peffect->owner = pduel->game_field->core.reason_effect->get_handler(); peffect->owner = pduel->game_field->core.reason_effect->get_handler();
...@@ -2021,7 +2021,7 @@ int32 card::replace_effect(uint32 code, uint32 reset, uint32 count) { ...@@ -2021,7 +2021,7 @@ int32 card::replace_effect(uint32 code, uint32 reset, uint32 count) {
for(auto& peffect : pduel->uncopy) for(auto& peffect : pduel->uncopy)
pduel->delete_effect(peffect); pduel->delete_effect(peffect);
pduel->uncopy.clear(); pduel->uncopy.clear();
if(!(data.type & TYPE_EFFECT)) { if((data.type & TYPE_MONSTER) && !(data.type & TYPE_EFFECT)) {
effect* peffect = pduel->new_effect(); effect* peffect = pduel->new_effect();
if(pduel->game_field->core.reason_effect) if(pduel->game_field->core.reason_effect)
peffect->owner = pduel->game_field->core.reason_effect->get_handler(); peffect->owner = pduel->game_field->core.reason_effect->get_handler();
......
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