From 16d9c5456ca8d41894aa00fdf36ef5a21e0e26c3 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@ucw.cz>
Date: Wed, 21 Mar 2012 23:18:17 +0100
Subject: [PATCH] [FEAT_CAPTURE] payloads: Include countstones payloads only in
 feature_payloads() and if enabled

---
 pattern.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pattern.c b/pattern.c
index 30e8d54..6726e4e 100644
--- a/pattern.c
+++ b/pattern.c
@@ -40,7 +40,7 @@ static const struct feature_info {
 	char *name;
 	int payloads;
 } features[FEAT_MAX] = {
-	[FEAT_CAPTURE] = { .name = "capture", .payloads = 64 * (CAPTURE_COUNTSTONES_MAX + 1) },
+	[FEAT_CAPTURE] = { .name = "capture", .payloads = 64 },
 	[FEAT_AESCAPE] = { .name = "atariescape", .payloads = 16 },
 	[FEAT_SELFATARI] = { .name = "selfatari", .payloads = 4 },
 	[FEAT_ATARI] = { .name = "atari", .payloads = 4 },
@@ -85,6 +85,11 @@ int
 feature_payloads(struct pattern_setup *pat, enum feature_id f)
 {
 	switch (f) {
+		case FEAT_CAPTURE:
+			int payloads = features[f].payloads;
+			if (pat->ps[FEAT_CAPTURE] & (1<<PF_CAPTURE_COUNTSTONES))
+				payloads *= CAPTURE_COUNTSTONES_MAX + 1;
+			return payloads;
 		case FEAT_SPATIAL:
 			assert(features[f].payloads < 0);
 			return pat->pc.spat_dict->nspatials;
-- 
2.11.4.GIT