Skip to content

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

fix Effect.IsActivated

parent 0f903247
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libcard.cpp
View file @ c658d787
...@@ -985,7 +985,7 @@ int32 scriptlib::card_register_effect(lua_State *L) { ...@@ -985,7 +985,7 @@ int32 scriptlib::card_register_effect(lua_State *L) {
pduel->game_field->core.reseted_effects.insert(peffect); pduel->game_field->core.reseted_effects.insert(peffect);
return 0; return 0;
} }
if((peffect->type & 0x7e0) if((peffect->type & 0x7f0)
|| (pduel->game_field->core.reason_effect && (pduel->game_field->core.reason_effect->status & EFFECT_STATUS_ACTIVATED))) || (pduel->game_field->core.reason_effect && (pduel->game_field->core.reason_effect->status & EFFECT_STATUS_ACTIVATED)))
peffect->status |= EFFECT_STATUS_ACTIVATED; peffect->status |= EFFECT_STATUS_ACTIVATED;
int32 id; int32 id;
......
libduel.cpp
View file @ c658d787
...@@ -71,7 +71,7 @@ int32 scriptlib::duel_register_effect(lua_State *L) { ...@@ -71,7 +71,7 @@ int32 scriptlib::duel_register_effect(lua_State *L) {
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* pduel = peffect->pduel; duel* pduel = peffect->pduel;
if((peffect->type & 0x7e0) if((peffect->type & 0x7f0)
|| (pduel->game_field->core.reason_effect && (pduel->game_field->core.reason_effect->status & EFFECT_STATUS_ACTIVATED))) || (pduel->game_field->core.reason_effect && (pduel->game_field->core.reason_effect->status & EFFECT_STATUS_ACTIVATED)))
peffect->status |= EFFECT_STATUS_ACTIVATED; peffect->status |= EFFECT_STATUS_ACTIVATED;
pduel->game_field->add_effect(peffect, playerid); pduel->game_field->add_effect(peffect, playerid);
......
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