From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 9 Jul 2013 00:39:02 +0000 (+0200)
Subject: Improved map generation algorithm.
X-Git-Tag: tce~1168
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/day?a=commitdiff_plain;h=fbff7bf7700c79ad484a83353685ecebf2a3541e;p=plomrogue

Improved map generation algorithm.
---

diff --git a/src/roguelike.c b/src/roguelike.c
index 0431a10..3f5469c 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -56,9 +56,8 @@ struct Map init_map () {
     for (x = 0; x < map.size.x; x++)
       map.cells[(y * map.size.x) + x] = '~';
   map.cells[size / 2 + (map.size.x / 2)] = '.';
-  uint32_t repeats, root, curpos;
-  for (root = 0; root * root * root < size; root++);
-  for (repeats = 0; repeats < size * root; repeats++) {
+  uint32_t curpos;
+  while (1) {
     y = rrand(0, 0) % map.size.y;
     x = rrand(0, 0) % map.size.x;
     curpos = y * map.size.x + x;
@@ -66,8 +65,10 @@ struct Map init_map () {
         (   (curpos >= map.size.x && '.' == map.cells[curpos - map.size.x])
          || (curpos < map.size.x * (map.size.y-1) && '.' == map.cells[curpos + map.size.x])
          || (curpos > 0 && curpos % map.size.x != 0 && '.' == map.cells[curpos-1])
-         || (curpos < (map.size.x * map.size.y) && (curpos+1) % map.size.x != 0 && '.' == map.cells[curpos+1])))
-      map.cells[y * map.size.x + x] = '.'; }
+         || (curpos < (map.size.x * map.size.y) && (curpos+1) % map.size.x != 0 && '.' == map.cells[curpos+1]))) {
+      if (y == 0 || y == map.size.y - 1 || x == 0 || x == map.size.x - 1)
+        break;
+      map.cells[y * map.size.x + x] = '.'; } }
   return map; }
 
 void map_scroll (struct Map * map, char dir) {