Skip to content

Y
ygopro-core
Commit 2d083d3b authored by DailyShana's avatar DailyShana
Browse files
Options

fix

parent db4019d2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
effect.cpp
View file @ 2d083d3b
...@@ -511,7 +511,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) { ...@@ -511,7 +511,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) {
uint8 pid = get_handler_player(); uint8 pid = get_handler_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 & 0xff & reset_flag)) && (reset_level & 0x3ff & reset_flag))
reset_count--; reset_count--;
if((reset_count & 0xff) == 0) if((reset_count & 0xff) == 0)
return TRUE; return TRUE;
......
libduel.cpp
View file @ 2d083d3b
...@@ -1524,7 +1524,7 @@ int32 scriptlib::duel_skip_phase(lua_State *L) { ...@@ -1524,7 +1524,7 @@ int32 scriptlib::duel_skip_phase(lua_State *L) {
peffect->effect_owner = playerid; peffect->effect_owner = playerid;
peffect->type = EFFECT_TYPE_FIELD; peffect->type = EFFECT_TYPE_FIELD;
peffect->code = code; peffect->code = code;
peffect->reset_flag = (reset & 0xff) | RESET_PHASE | RESET_SELF_TURN; peffect->reset_flag = (reset & 0x3ff) | RESET_PHASE | RESET_SELF_TURN;
peffect->flag[0] = EFFECT_FLAG_CANNOT_DISABLE | EFFECT_FLAG_PLAYER_TARGET; peffect->flag[0] = EFFECT_FLAG_CANNOT_DISABLE | EFFECT_FLAG_PLAYER_TARGET;
peffect->s_range = 1; peffect->s_range = 1;
peffect->o_range = 0; peffect->o_range = 0;
......
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