Skip to content

Y
ygopro-core
Commit f04cccc6 authored by mercury233's avatar mercury233
Browse files
Options

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

parents 82b74b7c 169d577b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 38 deletions
field.cpp
View file @ f04cccc6
...@@ -3381,8 +3381,9 @@ int32 field::get_cteffect(effect* peffect, int32 playerid, int32 store) { ...@@ -3381,8 +3381,9 @@ int32 field::get_cteffect(effect* peffect, int32 playerid, int32 store) {
continue; continue;
uint32 code = efit.first; uint32 code = efit.first;
if(code == EVENT_FREE_CHAIN || code == EVENT_PHASE + infos.phase) { if(code == EVENT_FREE_CHAIN || code == EVENT_PHASE + infos.phase) {
nil_event.event_code = code; tevent test_event;
if(get_cteffect_evt(feffect, playerid, nil_event, store) && !store) test_event.event_code = code;
if(get_cteffect_evt(feffect, playerid, test_event, store) && !store)
return TRUE; return TRUE;
} else { } else {
for(const auto& ev : core.point_event) { for(const auto& ev : core.point_event) {
...@@ -3431,8 +3432,9 @@ int32 field::check_cteffect_hint(effect* peffect, uint8 playerid) { ...@@ -3431,8 +3432,9 @@ int32 field::check_cteffect_hint(effect* peffect, uint8 playerid) {
continue; continue;
uint32 code = efit.first; uint32 code = efit.first;
if(code == EVENT_FREE_CHAIN || code == EVENT_PHASE + infos.phase) { if(code == EVENT_FREE_CHAIN || code == EVENT_PHASE + infos.phase) {
nil_event.event_code = code; tevent test_event;
if(get_cteffect_evt(feffect, playerid, nil_event, FALSE) test_event.event_code = code;
if(get_cteffect_evt(feffect, playerid, test_event, FALSE)
&& (code != EVENT_FREE_CHAIN || check_hint_timing(feffect))) && (code != EVENT_FREE_CHAIN || check_hint_timing(feffect)))
return TRUE; return TRUE;
} else { } else {
......
operations.cpp
View file @ f04cccc6
...@@ -5092,8 +5092,9 @@ int32 field::activate_effect(uint16 step, effect* peffect) { ...@@ -5092,8 +5092,9 @@ int32 field::activate_effect(uint16 step, effect* peffect) {
case 0: { case 0: {
card* phandler = peffect->get_handler(); card* phandler = peffect->get_handler();
int32 playerid = phandler->current.controler; int32 playerid = phandler->current.controler;
nil_event.event_code = EVENT_FREE_CHAIN; tevent test_event;
if(!peffect->is_activateable(playerid, nil_event)) test_event.event_code = EVENT_FREE_CHAIN;
if(!peffect->is_activateable(playerid, test_event))
return TRUE; return TRUE;
chain newchain; chain newchain;
newchain.flag = 0; newchain.flag = 0;
......
processor.cpp
View file @ f04cccc6
This diff is collapsed.
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