Skip to content

Y
ygopro-2pick
Commit 0eb39418 authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix

parent 3930afd1
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
ocgcore/effect.cpp
View file @ 0eb39418
...@@ -171,8 +171,12 @@ int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_con ...@@ -171,8 +171,12 @@ int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_con
if(handler->current.location == LOCATION_HAND) { if(handler->current.location == LOCATION_HAND) {
if(handler->data.type & TYPE_TRAP) if(handler->data.type & TYPE_TRAP)
ecode = EFFECT_TRAP_ACT_IN_HAND; ecode = EFFECT_TRAP_ACT_IN_HAND;
else if((handler->data.type & TYPE_SPELL) && (handler->data.type & TYPE_QUICKPLAY) && pduel->game_field->infos.turn_player != playerid) else if((handler->data.type & TYPE_SPELL) && pduel->game_field->infos.turn_player != playerid) {
ecode = EFFECT_QP_ACT_IN_NTPHAND; if(handler->data.type & TYPE_QUICKPLAY)
ecode = EFFECT_QP_ACT_IN_NTPHAND;
else
return FALSE;
}
} else if(handler->current.location == LOCATION_SZONE) { } else if(handler->current.location == LOCATION_SZONE) {
if((handler->data.type & TYPE_TRAP) && handler->get_status(STATUS_SET_TURN)) if((handler->data.type & TYPE_TRAP) && handler->get_status(STATUS_SET_TURN))
ecode = EFFECT_TRAP_ACT_IN_SET_TURN; ecode = EFFECT_TRAP_ACT_IN_SET_TURN;
......
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