chain attack

93e6fa28 · salix5 · a688daee · 93e6fa28
Commit 93e6fa28 authored May 29, 2015 by salix5
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

ocgcore/field.cpp ocgcore/field.cpp +3 -2

No files found.
--- a/ocgcore/field.cpp
+++ b/ocgcore/field.cpp
@@ -1655,8 +1655,9 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack)
 	}
 	if(must_be_attack.size())
 		return TRUE;
-	if((mcount == 0 || pcard->is_affected_by_effect(EFFECT_DIRECT_ATTACK)) && !pcard->is_affected_by_effect(EFFECT_CANNOT_DIRECT_ATTACK) 
-			&& !core.chain_attack_target)
+	if((mcount == 0 || pcard->is_affected_by_effect(EFFECT_DIRECT_ATTACK)) 
+			&& !pcard->is_affected_by_effect(EFFECT_CANNOT_DIRECT_ATTACK) 
+			&& !(chain_attack && core.chain_attack_target))
 		pcard->operation_param = 1;
 	return must_be_attack.size() ? TRUE : FALSE;
 }