Commit d778cc33 authored by DailyShana's avatar DailyShana

fix

parent 10b62ad9
...@@ -2365,11 +2365,11 @@ int32 card::is_removeable(uint8 playerid) { ...@@ -2365,11 +2365,11 @@ int32 card::is_removeable(uint8 playerid) {
return TRUE; return TRUE;
} }
int32 card::is_removeable_as_cost(uint8 playerid) { int32 card::is_removeable_as_cost(uint8 playerid) {
if(is_affected_by_effect(EFFECT_CANNOT_USE_AS_COST)) if(current.location == LOCATION_REMOVED)
return FALSE; return FALSE;
if(!pduel->game_field->is_player_can_remove(playerid, this)) if(is_affected_by_effect(EFFECT_CANNOT_USE_AS_COST))
return FALSE; return FALSE;
if(is_affected_by_effect(EFFECT_CANNOT_REMOVE)) if(!is_removeable(playerid))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
......
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