Skip to content

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

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

parents 46334429 59559357
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
field.cpp
View file @ 33616e9a
...@@ -1253,8 +1253,8 @@ void field::reset_phase(uint32 phase) { ...@@ -1253,8 +1253,8 @@ void field::reset_phase(uint32 phase) {
// work around: skip turn still raise reset_phase(PHASE_END) // work around: skip turn still raise reset_phase(PHASE_END)
// without this taking control only for one turn will be returned when skipping turn // without this taking control only for one turn will be returned when skipping turn
// RESET_TURN_END should be introduced // RESET_TURN_END should be introduced
if((*rm)->code == EFFECT_SET_CONTROL) //if((*rm)->code == EFFECT_SET_CONTROL)
continue; // continue;
if((*rm)->reset(phase, RESET_PHASE)) { if((*rm)->reset(phase, RESET_PHASE)) {
if((*rm)->is_flag(EFFECT_FLAG_FIELD_ONLY)) if((*rm)->is_flag(EFFECT_FLAG_FIELD_ONLY))
remove_effect((*rm)); remove_effect((*rm));
......
processor.cpp
View file @ 33616e9a
...@@ -1408,8 +1408,7 @@ int32 field::process_phase_event(int16 step, int32 phase) { ...@@ -1408,8 +1408,7 @@ int32 field::process_phase_event(int16 step, int32 phase) {
uint8 tp = infos.turn_player; uint8 tp = infos.turn_player;
if(!(((peffect->reset_flag & RESET_SELF_TURN) && pid == tp) || ((peffect->reset_flag & RESET_OPPO_TURN) && pid != tp))) if(!(((peffect->reset_flag & RESET_SELF_TURN) && pid == tp) || ((peffect->reset_flag & RESET_OPPO_TURN) && pid != tp)))
continue; continue;
peffect->reset_count--; if(peffect->reset_count != 1)
if(peffect->reset_count != 0)
continue; continue;
card* phandler = peffect->get_handler(); card* phandler = peffect->get_handler();
if(pid != phandler->current.controler) { if(pid != phandler->current.controler) {
......
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