~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
James H profiled the new Same Game grid generator and discovered it
[sgt/puzzles]
/
samegame.c
diff --git
a/samegame.c
b/samegame.c
index
60e0272
..
b9078eb
100644
(file)
--- a/
samegame.c
+++ b/
samegame.c
@@
-398,11
+398,6
@@
static void gen_grid(int w, int h, int nc, int *grid, random_state *rs)
if (n == 0)
break; /* we're done */
if (n == 0)
break; /* we're done */
- /*
- * Shuffle the list.
- */
- shuffle(list, n, sizeof(*list), rs);
-
#ifdef GENERATION_DIAGNOSTICS
printf("initial grid:\n");
{
#ifdef GENERATION_DIAGNOSTICS
printf("initial grid:\n");
{
@@
-420,13
+415,17
@@
static void gen_grid(int w, int h, int nc, int *grid, random_state *rs)
#endif
/*
#endif
/*
- * Now go through the list one element at a time and
- * actually attempt to insert something there.
+ * Now go through the list one element at a time in
+ * random order, and actually attempt to insert
+ * something there.
*/
while (n-- > 0) {
int dirs[4], ndirs, dir;
*/
while (n-- > 0) {
int dirs[4], ndirs, dir;
- pos = list[n];
+ i = random_upto(rs, n+1);
+ pos = list[i];
+ list[i] = list[n];
+
x = pos % w;
y = pos / w;
x = pos % w;
y = pos / w;