Skip to content

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

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

parents 349d7e9e 79345ca9
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
field.cpp
View file @ d6012134
...@@ -1920,7 +1920,7 @@ void field::update_disable_check_list(effect* peffect) { ...@@ -1920,7 +1920,7 @@ void field::update_disable_check_list(effect* peffect) {
void field::add_to_disable_check_list(card* pcard) { void field::add_to_disable_check_list(card* pcard) {
auto result=effects.disable_check_set.insert(pcard); auto result=effects.disable_check_set.insert(pcard);
if(!result.second) if(!result.second)
return return;
effects.disable_check_list.push_back(pcard); effects.disable_check_list.push_back(pcard);
} }
void field::adjust_disable_check_list() { void field::adjust_disable_check_list() {
......
processor.cpp
View file @ d6012134
...@@ -4377,9 +4377,9 @@ int32 field::add_chain(uint16 step) { ...@@ -4377,9 +4377,9 @@ int32 field::add_chain(uint16 step) {
} else { } else {
uint32 sumplayer = clit.triggering_player; uint32 sumplayer = clit.triggering_player;
// genarally setting op_player is unnecessary when the effect targets cards // genarally setting op_player is unnecessary when the effect targets cards
// in the case of CATEGORY_SPECIAL_SUMMON(with EFFECT_FLAG_CARD_TARGET), op_player=1 // in the case of CATEGORY_SPECIAL_SUMMON(with EFFECT_FLAG_CARD_TARGET), op_player=0x10
// indecates that it is the opponent that special summons the target monsters // indecates that it is the opponent that special summons the target monsters
if(peffect->is_flag(EFFECT_FLAG_CARD_TARGET) && optarget.op_player == 1) if(peffect->is_flag(EFFECT_FLAG_CARD_TARGET) && optarget.op_player == 0x10)
sumplayer = 1 - sumplayer; sumplayer = 1 - sumplayer;
for(auto& pcard : optarget.op_cards->container) { for(auto& pcard : optarget.op_cards->container) {
if(pcard->spsummon_code) { if(pcard->spsummon_code) {
...@@ -4629,9 +4629,9 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2 ...@@ -4629,9 +4629,9 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2
} else { } else {
uint32 sumplayer = cait->triggering_player; uint32 sumplayer = cait->triggering_player;
// genarally setting op_player is unnecessary when the effect targets cards // genarally setting op_player is unnecessary when the effect targets cards
// in the case of CATEGORY_SPECIAL_SUMMON(with EFFECT_FLAG_CARD_TARGET), op_player=1 // in the case of CATEGORY_SPECIAL_SUMMON(with EFFECT_FLAG_CARD_TARGET), op_player=0x10
// indecates that it is the opponent that special summons the target monsters // indecates that it is the opponent that special summons the target monsters
if(cait->triggering_effect->is_flag(EFFECT_FLAG_CARD_TARGET) && optarget.op_player == 1) if(cait->triggering_effect->is_flag(EFFECT_FLAG_CARD_TARGET) && optarget.op_player == 0x10)
sumplayer = 1 - sumplayer; sumplayer = 1 - sumplayer;
for(auto& ptarget : optarget.op_cards->container) { for(auto& ptarget : optarget.op_cards->container) {
if((core.global_flag & GLOBALFLAG_SPSUMMON_ONCE) && ptarget->spsummon_code) if((core.global_flag & GLOBALFLAG_SPSUMMON_ONCE) && ptarget->spsummon_code)
......
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