From 405aaeb546b6ef2ae25a024c3e2cdc0c73b7d525 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Mon, 19 Apr 2021 17:56:04 -0400
Subject: Only use cells for moveColumn

So long as the move queuer doesn't use empty tableau stacks correctly,
it shouldn't use them at all. This way it's easier to do the correct
moves manually.
---
 bin/freecell.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/freecell.c b/bin/freecell.c
index d544590e..7c0f9ee6 100644
--- a/bin/freecell.c
+++ b/bin/freecell.c
@@ -173,10 +173,9 @@ static void moveSingle(uint dst, uint src) {
 	enq(dst, src);
 }
 
-static uint freeCells(uint cells[static Stacks], uint dst) {
+static uint freeCells(uint cells[static 4]) {
 	uint len = 0;
-	for (uint i = Cell; i < Stacks; ++i) {
-		if (i == dst) continue;
+	for (uint i = Cell; i < Tableau; ++i) {
 		if (!stacks[i].len) cells[len++] = i;
 	}
 	return len;
@@ -195,8 +194,8 @@ static uint moveDepth(uint src) {
 
 static void moveColumn(uint dst, uint src) {
 	uint depth;
-	uint cells[Stacks];
-	uint free = freeCells(cells, dst);
+	uint cells[4];
+	uint free = freeCells(cells);
 	for (depth = moveDepth(src); depth; --depth) {
 		if (free < depth-1) continue;
 		if (valid(dst, stacks[src].cards[stacks[src].len-depth])) break;
-- 
cgit 1.4.1

'>commit</a> <a href='/src/diff/bin/man1/bibsort.1?id=c350243ace2ea38a0142000eeb0b9ac24b73ae0f&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/bin/man1/bibsort.1'>
<input type='hidden' name='id' value='c350243ace2ea38a0142000eeb0b9ac24b73ae0f'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=c350243ace2ea38a0142000eeb0b9ac24b73ae0f&amp;follow=1'>root</a>/<a href='/src/log/bin?id=c350243ace2ea38a0142000eeb0b9ac24b73ae0f&amp;follow=1'>bin</a>/<a href='/src/log/bin/man1?id=c350243ace2ea38a0142000eeb0b9ac24b73ae0f&amp;follow=1'>man1</a>/<a href='/src/log/bin/man1/bibsort.1?id=c350243ace2ea38a0142000eeb0b9ac24b73ae0f&amp;follow=1'>bibsort.1</a> (<a href='/src/log/bin/man1/bibsort.1?id=c350243ace2ea38a0142000eeb0b9ac24b73ae0f'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/man1/bibsort.1?id=c350243ace2ea38a0142000eeb0b9ac24b73ae0f&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-08-31 15:21:09 -0400'>2024-08-31</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-08-22/lens?id=83b008d125625ef3d6e3ba4afe03e0079527bc5e&amp;follow=1'>Add photos from August 22</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-08-16 21:37:13 -0400'>2024-08-16</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-08-10/lens?id=c8f0df1c3582a3f7289c713e16e67b8fcb3e25af&amp;follow=1'>Add first roll through Zenit-122</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-08-16 21:36:50 -0400'>2024-08-16</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=50a06120e13ba648fca745951170cef59037e35a&amp;follow=1'>Add ability to specify camera body</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-08-14 19:38:21 -0400'>2024-08-14</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-08-02/lens?id=ff0cda1008c786c7d37049b6fcd54ae7aeeeee80&amp;follow=1'>Add photos from August 2</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-08-13 18:50:30 -0400'>2024-08-13</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-07-30/lens?id=3efdd8cac937f78bd0822bfa937304ed203bb05f&amp;follow=1'>Add photos from July 30 (actually 29 evening)</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-08-09 22:47:57 -0400'>2024-08-09</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-07-29/lens?id=a88a06577e4872a2b59229ea2b129551a574ea8e&amp;follow=1'>Add photos from July 29</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-08-08 22:07:31 -0400'>2024-08-08</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-07-27/lens?id=e3c4e8dedc9e0719341417ad0fcb1f8e118c4372&amp;follow=1'>Add photos from July 27</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-07-26 15:50:15 -0400'>2024-07-26</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-07-14/lens?id=2e2d7556a06d065dc602d462c5f147f8f2f89f4e&amp;follow=1'>Add photos from July 14</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-07-16 12:07:45 -0400'>2024-07-16</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-07-09/lens?id=47f217306f7fc1e6c34c74e5ba236d39fe921995&amp;follow=1'>Add photos from July 9</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-07-15 11:56:59 -0400'>2024-07-15</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-07-06/lens?id=f63a17f3f56b03d21910e56f1f3e629096a7a168&amp;follow=1'>Add photos from July 6</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-07-10 20:18:46 -0400'>2024-07-10</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-07-04/lens?id=33dc5229a56defdf616b72c5e32dab42beb11918&amp;follow=1'>Add the end of the Harman Phoenix roll</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-07-08 21:19:30 -0400'>2024-07-08</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-07-03/lens?id=5f8e39ec0a4c52292c907648632824f0af1cfb94&amp;follow=1'>Add photos from July 3, the hike</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-07-07 19:58:21 -0400'>2024-07-07</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-07-01/lens?id=d8f7fc0bada2c1740e814ba67449df6e928812ff&amp;follow=1'>Add photos from July 1</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-07-07 15:12:49 -0400'>2024-07-07</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-06-25/lens?id=cf3163745dccf37925e54b84aaf38685c717186a&amp;follow=1'>Add photos from June 25-30</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-30 12:11:25 -0400'>2024-06-30</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-06-22/lens?id=0c7217c70986100325217b2b592e0ccf8e5ee9a1&amp;follow=1'>Add photos from June 22 (and the few days after that)</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-30 12:09:04 -0400'>2024-06-30</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=bac3e736fad6a70072d30719f738d22d9f34b8c5&amp;follow=1'>Accommodate lower-case .jpg files</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-23 11:03:55 -0400'>2024-06-23</span></td><td><a href='/src/commit/txt/shows.txt?id=ced3d1807fe42a992043c4c306ea51f324b89c69&amp;follow=1'>Add another BACKXWASH show</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-16 19:58:59 -0400'>2024-06-16</span></td><td><a href='/src/commit/www/causal.agency/index.7?id=6b4bab7f251af3b4b16ab601200a0553c31c63f3&amp;follow=1'>Update bio</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-15 11:34:00 -0400'>2024-06-15</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-06-12/lens?id=a803eccd84cde8678908eb546eb9554e9993dbd4&amp;follow=1'>Add photo descriptions from June 12</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-10 17:35:47 -0400'>2024-06-10</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-06-08/lens?id=ea07b068de5fdcda1a3c6814638f71d74a1578cd&amp;follow=1'>Add first roll of film from June 8</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-10 17:13:08 -0400'>2024-06-10</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=da2851683028837f8ae687a0d0ba941c3288c133&amp;follow=1'>Cope with not having an EXIF info</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-10 16:58:02 -0400'>2024-06-10</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=2d87b53a18d48e9d8346c8b352aea5f2096a459d&amp;follow=1'>Resize using target pixel counts for consistency</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-10 14:21:45 -0400'>2024-06-10</span></td><td><a href='/src/commit/txt/books.txt?id=013264d92bc84a8a2a133d9b55b6820fcad44806&amp;follow=1'>Add The Girl Who Was Convinced...</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-09 19:07:18 -0400'>2024-06-09</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-05-31/IMG_2114.txt?id=5eea09d6bd3d109dffc48678600d997b42699788&amp;follow=1'>Add photos from May 31</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-09 18:57:02 -0400'>2024-06-09</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=6f35229b87e64472805ba83e70bac5d8f90cb3e0&amp;follow=1'>Use monospace on photo pages</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-06-09 18:48:15 -0400'>2024-06-09</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=2df9d0291f9451fd603f102778abf64a4d62f977&amp;follow=1'>Put lens and (future) film at the tops of photo pages</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-05-22 12:16:41 -0400'>2024-05-22</span></td><td><a href='/src/commit/bin/xx.c?id=625662a5c1cbb71cf37653df1f31cd60c48b18ae&amp;follow=1'>Remove use of sysexits.h</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-05-22 11:55:53 -0400'>2024-05-22</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-05-06/IMG_2015.txt?id=00e1552bfe74992ccd5653a738a984e47bb2699c&amp;follow=1'>Add photo descriptions from 05-03 and 05-06</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-05-21 17:07:53 -0400'>2024-05-21</span></td><td><a href='/src/commit/bin/when.y?id=cc8dba0836353aa5ea1096d526daae9129da3b5e&amp;follow=1'>Fix = precedence in when</a></td><td>June McEnroe