Skip to content

Y
YGOMobile
Commit 226d77fc authored by fallenstardust's avatar fallenstardust
Browse files
Options

sync ocgcore

parent c57d6445
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 26 deletions
Classes/ocgcore/card.cpp
View file @ 226d77fc
...@@ -106,7 +106,7 @@ uint32 card::get_infos(byte* buf, int32 query_flag, int32 use_cache) { ...@@ -106,7 +106,7 @@ uint32 card::get_infos(byte* buf, int32 query_flag, int32 use_cache) {
if(query_flag & QUERY_CODE) *p++ = data.code; if(query_flag & QUERY_CODE) *p++ = data.code;
if(query_flag & QUERY_POSITION) *p++ = get_info_location(); if(query_flag & QUERY_POSITION) *p++ = get_info_location();
if(!use_cache) { if(!use_cache) {
if(query_flag & QUERY_ALIAS) q_cache.code = *p++ = get_code(); if(query_flag & QUERY_ALIAS) q_cache.alias = *p++ = get_code();
if(query_flag & QUERY_TYPE) q_cache.type = *p++ = get_type(); if(query_flag & QUERY_TYPE) q_cache.type = *p++ = get_type();
if(query_flag & QUERY_LEVEL) q_cache.level = *p++ = get_level(); if(query_flag & QUERY_LEVEL) q_cache.level = *p++ = get_level();
if(query_flag & QUERY_RANK) q_cache.rank = *p++ = get_rank(); if(query_flag & QUERY_RANK) q_cache.rank = *p++ = get_rank();
......
Classes/ocgcore/processor.cpp
View file @ 226d77fc
...@@ -4342,7 +4342,7 @@ int32 field::add_chain(uint16 step) { ...@@ -4342,7 +4342,7 @@ int32 field::add_chain(uint16 step) {
set_spsummon_counter(clit.triggering_player, true, true); set_spsummon_counter(clit.triggering_player, true, true);
if(clit.opinfos[0x200].op_player == PLAYER_ALL) if(clit.opinfos[0x200].op_player == PLAYER_ALL)
set_spsummon_counter(1 - clit.triggering_player, true, true); set_spsummon_counter(1 - clit.triggering_player, true, true);
if((core.global_flag & GLOBALFLAG_SPSUMMON_ONCE) && peffect->is_flag(EFFECT_FLAG_CARD_TARGET)) { if(core.global_flag & GLOBALFLAG_SPSUMMON_ONCE) {
auto& optarget = clit.opinfos[0x200]; auto& optarget = clit.opinfos[0x200];
if(optarget.op_cards) { if(optarget.op_cards) {
if(optarget.op_player == PLAYER_ALL) { if(optarget.op_player == PLAYER_ALL) {
...@@ -4588,7 +4588,6 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2 ...@@ -4588,7 +4588,6 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2
if(cait->opinfos[0x200].op_player == PLAYER_ALL && core.spsummon_state_count_tmp[1 - cait->triggering_player] == core.spsummon_state_count[1 - cait->triggering_player]) if(cait->opinfos[0x200].op_player == PLAYER_ALL && core.spsummon_state_count_tmp[1 - cait->triggering_player] == core.spsummon_state_count[1 - cait->triggering_player])
set_spsummon_counter(1 - cait->triggering_player); set_spsummon_counter(1 - cait->triggering_player);
//sometimes it may add twice, only works for once per turn //sometimes it may add twice, only works for once per turn
if(cait->triggering_effect->is_flag(EFFECT_FLAG_CARD_TARGET)) {
auto& optarget = cait->opinfos[0x200]; auto& optarget = cait->opinfos[0x200];
if(optarget.op_cards) { if(optarget.op_cards) {
if(optarget.op_player == PLAYER_ALL) { if(optarget.op_player == PLAYER_ALL) {
...@@ -4618,7 +4617,6 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2 ...@@ -4618,7 +4617,6 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2
} }
} }
} }
}
core.spsummon_state_count_tmp[0] = 0; core.spsummon_state_count_tmp[0] = 0;
core.spsummon_state_count_tmp[1] = 0; core.spsummon_state_count_tmp[1] = 0;
core.chain_solving = FALSE; core.chain_solving = FALSE;
......
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