chiark / gitweb /
Remove vestigial code from the previous attempt at clever grid
authorSimon Tatham <anakin@pobox.com>
Wed, 12 May 2004 18:28:11 +0000 (18:28 +0000)
committerSimon Tatham <anakin@pobox.com>
Wed, 12 May 2004 18:28:11 +0000 (18:28 +0000)
generation. Grid generation should now be orders of magnitude faster
at large sizes.

[originally from svn r4220]

rect.c

diff --git a/rect.c b/rect.c
index 0d71226d86bd24ea2a5afeb1bdd445f3bfd8dd50..6ad51713ccd3948338944ce9c58aa51cf4a065e5 100644 (file)
--- a/rect.c
+++ b/rect.c
@@ -216,25 +216,6 @@ static struct rectlist *get_rectlist(game_params *params, int *grid)
                 continue;
             for (x = 0; x <= params->w - rw; x++)
                 for (y = 0; y <= params->h - rh; y++) {
-                    /*
-                     * We have a candidate rectangle placement. See
-                     * if it's unobstructed.
-                     */
-                    int xx, yy;
-                    int ok;
-
-                    ok = TRUE;
-                    for (xx = x; xx < x+rw; xx++)
-                        for (yy = y; yy < y+rh; yy++)
-                            if (index(params, grid, xx, yy) >= 0) {
-                                ok = FALSE;
-                                goto break1;   /* break both loops at once */
-                            }
-                    break1:
-
-                    if (!ok)
-                        continue;
-
                     if (nrects >= rectsize) {
                         rectsize = nrects + 256;
                         rects = sresize(rects, rectsize, struct rect);