Skip to content

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

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

parents 7acb5b8d 21e7022c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 13 deletions
operations.cpp
View file @ d3f8c2bc
......@@ -1858,9 +1858,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
return FALSE;
}
case 11: {
uint8 targetplayer = target->current.controler;
if(target->owner != targetplayer)
set_control(target, targetplayer, 0, 0);
set_control(target, target->current.controler, 0, 0);
core.phase_action = TRUE;
target->current.reason = REASON_SUMMON;
target->summon_player = sumplayer;
......@@ -2302,9 +2300,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
return FALSE;
}
case 9: {
uint8 targetplayer = target->current.controler;
if(target->owner != targetplayer)
set_control(target, targetplayer, 0, 0);
set_control(target, target->current.controler, 0, 0);
core.phase_action = TRUE;
core.normalsummon_state_count[setplayer]++;
check_card_counter(target, 2, setplayer);
......@@ -2584,9 +2580,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
return FALSE;
}
case 5: {
uint8 targetplayer = target->current.controler;
if(target->owner != targetplayer)
set_control(target, targetplayer, 0, 0);
set_control(target, target->current.controler, 0, 0);
core.phase_action = TRUE;
target->current.reason_effect = core.units.begin()->peffect;
core.summoning_card = target;
......@@ -2783,8 +2777,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
pduel->write_buffer8(pcard->current.location);
pduel->write_buffer8(pcard->current.sequence);
pduel->write_buffer8(pcard->current.position);
if(pcard->owner != pcard->current.controler)
set_control(pcard, pcard->current.controler, 0, 0);
set_control(pcard, pcard->current.controler, 0, 0);
if(pgroup->it != pgroup->container.end())
core.units.begin()->step = 22;
return FALSE;
......@@ -2952,8 +2945,7 @@ int32 field::special_summon_step(uint16 step, group* targets, card* target, uint
}
case 3: {
returns.ivalue[0] = TRUE;
if(target->owner != target->current.controler)
set_control(target, target->current.controler, 0, 0);
set_control(target, target->current.controler, 0, 0);
target->set_status(STATUS_SPSUMMON_STEP, TRUE);
return TRUE;
}
......
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