Commit 048c4e6b authored by mercury233's avatar mercury233 Committed by GitHub

fix RESET_SELF_TURN RESET_OPPO_TURN (#356)

parent ec916a77
...@@ -580,7 +580,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) { ...@@ -580,7 +580,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) {
case RESET_PHASE: { case RESET_PHASE: {
if(!(reset_flag & RESET_PHASE)) if(!(reset_flag & RESET_PHASE))
return FALSE; return FALSE;
uint8 pid = get_handler_player(); uint8 pid = get_owner_player();
uint8 tp = handler->pduel->game_field->infos.turn_player; uint8 tp = handler->pduel->game_field->infos.turn_player;
if((((reset_flag & RESET_SELF_TURN) && pid == tp) || ((reset_flag & RESET_OPPO_TURN) && pid != tp)) if((((reset_flag & RESET_SELF_TURN) && pid == tp) || ((reset_flag & RESET_OPPO_TURN) && pid != tp))
&& (reset_level & 0x3ff & reset_flag)) && (reset_level & 0x3ff & reset_flag))
......
...@@ -1745,6 +1745,7 @@ int32 scriptlib::card_register_flag_effect(lua_State *L) { ...@@ -1745,6 +1745,7 @@ int32 scriptlib::card_register_flag_effect(lua_State *L) {
reset |= (RESET_SELF_TURN | RESET_OPPO_TURN); reset |= (RESET_SELF_TURN | RESET_OPPO_TURN);
duel* pduel = pcard->pduel; duel* pduel = pcard->pduel;
effect* peffect = pduel->new_effect(); effect* peffect = pduel->new_effect();
peffect->effect_owner = pduel->game_field->core.reason_player;
peffect->owner = pcard; peffect->owner = pcard;
peffect->handler = 0; peffect->handler = 0;
peffect->type = EFFECT_TYPE_SINGLE; peffect->type = EFFECT_TYPE_SINGLE;
......
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