From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 7 Jun 2009 23:04:29 +0000 (+0100)
Subject: commodity check works
X-Git-Tag: 1.9.2~137
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=17c06575dcc9063292e20da425fbaa317e34c2c8

commodity check works
---

diff --git a/pctb/structure.c b/pctb/structure.c
index 63cd641..bce649e 100644
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -304,17 +304,10 @@ void check_correct_commodities(void) {
 	for (y=0; y<allh; y++) {
 	  int want= all[y][x];
 	  if (want==' ') continue;
-#define PIXCHECK(dx,dy) \
-          if (get(alloffx+x+dx, alloffy+y+dy) == want) goto pix_found
-	  PIXCHECK( 0, 0);
-	  PIXCHECK(-1,-1);
-	  PIXCHECK(-1,+1);
-	  PIXCHECK(+1,-1);
-	  PIXCHECK(+1,+1);
-	  bad++;
-	  continue;
-	pix_found:
-	  good++;
+          if (get(alloffx+x, alloffy+y) == want)
+	    good++;
+	  else
+	    bad++;
 	}
       debugf("CHECKCOMMOD alloff=%d,%d good=%d bad=%d\n",
 	     alloffx,alloffy, good,bad);