Skip to content

Y
ygopro-core
Commit eb6f61df authored by salix5's avatar salix5
Browse files
Options

Effect.Clone()

parent a96a3b39
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
effect.cpp
View file @ eb6f61df
...@@ -211,8 +211,7 @@ int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_con ...@@ -211,8 +211,7 @@ int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_con
&& (!handler->is_position(POS_FACEUP) || !handler->is_status(STATUS_EFFECT_ENABLED))) && (!handler->is_position(POS_FACEUP) || !handler->is_status(STATUS_EFFECT_ENABLED)))
return FALSE; return FALSE;
if(!(type & (EFFECT_TYPE_FLIP | EFFECT_TYPE_TRIGGER_F)) if(!(type & (EFFECT_TYPE_FLIP | EFFECT_TYPE_TRIGGER_F))
&& !((type & EFFECT_TYPE_SINGLE) && !((type & EFFECT_TYPE_SINGLE) && (code == EVENT_TO_GRAVE || code == EVENT_DESTROYED || code == EVENT_SPSUMMON_SUCCESS || code == EVENT_TO_HAND))) {
&& (code == EVENT_TO_GRAVE || code == EVENT_DESTROYED || code == EVENT_SPSUMMON_SUCCESS || code == EVENT_TO_HAND))) {
if((code < 1132 || code > 1149) && pduel->game_field->infos.phase == PHASE_DAMAGE && !(is_flag(EFFECT_FLAG_DAMAGE_STEP))) if((code < 1132 || code > 1149) && pduel->game_field->infos.phase == PHASE_DAMAGE && !(is_flag(EFFECT_FLAG_DAMAGE_STEP)))
return FALSE; return FALSE;
if((code < 1134 || code > 1136) && pduel->game_field->infos.phase == PHASE_DAMAGE_CAL && !(is_flag(EFFECT_FLAG_DAMAGE_CAL))) if((code < 1134 || code > 1136) && pduel->game_field->infos.phase == PHASE_DAMAGE_CAL && !(is_flag(EFFECT_FLAG_DAMAGE_CAL)))
......
libeffect.cpp
View file @ eb6f61df
...@@ -40,7 +40,6 @@ int32 scriptlib::effect_clone(lua_State *L) { ...@@ -40,7 +40,6 @@ int32 scriptlib::effect_clone(lua_State *L) {
*ceffect = *peffect; *ceffect = *peffect;
ceffect->ref_handle = ref; ceffect->ref_handle = ref;
ceffect->handler = 0; ceffect->handler = 0;
ceffect->effect_owner = peffect->effect_owner;
if(peffect->condition) { if(peffect->condition) {
lua_rawgeti(L, LUA_REGISTRYINDEX, peffect->condition); lua_rawgeti(L, LUA_REGISTRYINDEX, peffect->condition);
ceffect->condition = luaL_ref(L, LUA_REGISTRYINDEX); ceffect->condition = luaL_ref(L, LUA_REGISTRYINDEX);
......
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