Skip to content

Y
ygopro-core
Commit 21e7022c authored by DailyShana's avatar DailyShana
Browse files
Options

fix setting control when summon/spsummon

parent 90f6e4c3
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 13 deletions
operations.cpp
View file @ 21e7022c
...@@ -1838,9 +1838,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui ...@@ -1838,9 +1838,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
return FALSE; return FALSE;
} }
case 11: { case 11: {
uint8 targetplayer = target->current.controler; set_control(target, target->current.controler, 0, 0);
if(target->owner != targetplayer)
set_control(target, targetplayer, 0, 0);
core.phase_action = TRUE; core.phase_action = TRUE;
target->current.reason = REASON_SUMMON; target->current.reason = REASON_SUMMON;
target->summon_player = sumplayer; target->summon_player = sumplayer;
...@@ -2282,9 +2280,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint ...@@ -2282,9 +2280,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
return FALSE; return FALSE;
} }
case 9: { case 9: {
uint8 targetplayer = target->current.controler; set_control(target, target->current.controler, 0, 0);
if(target->owner != targetplayer)
set_control(target, targetplayer, 0, 0);
core.phase_action = TRUE; core.phase_action = TRUE;
core.normalsummon_state_count[setplayer]++; core.normalsummon_state_count[setplayer]++;
check_card_counter(target, 2, setplayer); check_card_counter(target, 2, setplayer);
...@@ -2564,9 +2560,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin ...@@ -2564,9 +2560,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
return FALSE; return FALSE;
} }
case 5: { case 5: {
uint8 targetplayer = target->current.controler; set_control(target, target->current.controler, 0, 0);
if(target->owner != targetplayer)
set_control(target, targetplayer, 0, 0);
core.phase_action = TRUE; core.phase_action = TRUE;
target->current.reason_effect = core.units.begin()->peffect; target->current.reason_effect = core.units.begin()->peffect;
core.summoning_card = target; core.summoning_card = target;
...@@ -2759,7 +2753,6 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin ...@@ -2759,7 +2753,6 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
pduel->write_buffer8(pcard->current.location); pduel->write_buffer8(pcard->current.location);
pduel->write_buffer8(pcard->current.sequence); pduel->write_buffer8(pcard->current.sequence);
pduel->write_buffer8(pcard->current.position); 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()) if(pgroup->it != pgroup->container.end())
core.units.begin()->step = 22; core.units.begin()->step = 22;
...@@ -2928,7 +2921,6 @@ int32 field::special_summon_step(uint16 step, group* targets, card* target, uint ...@@ -2928,7 +2921,6 @@ int32 field::special_summon_step(uint16 step, group* targets, card* target, uint
} }
case 3: { case 3: {
returns.ivalue[0] = TRUE; 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); target->set_status(STATUS_SPSUMMON_STEP, TRUE);
return 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