Correctly update maplife-0.3.0

Wait with ncurses, not usleep().
Print (x,y) at bottom of screen.
Pass ruleint, width, height, delay as commandline-args (in that order)
Define TRUE and FALSE as macros

Signed-off-by: Aiden Woodruff <aiden.woodruff@gmail.com>

1 files changed, 104 insertions, 27 deletions

diff --git a/life.c b/life.c
index 14f9cdf..9af8c3f 100644
--- a/life.c
+++ b/life.c
@@ -1,9 +1,60 @@
 #include "life.h"
 
-char * update_map (char * base_map, const int width, const int height, char livecell, char deadcell, const int ruleint) {
+// Declare TRUE and FALSE
+#ifndef TRUE
+#define TRUE (1==1)
+#define FALSE (!TRUE)
+#endif
+
+char * update_map (char * base_map, const int width, const int height, char livecell, char deadcell, const unsigned int ruleint) {
   char * intermap = malloc((width * height)+1);
   memcpy(intermap, base_map, (width*height)+1);
   // Change intermap and stuff
+  for (int i = 0, x = 0, y = 0, surround = 0; i < width*height; i++, surround = 0) {
+    x = i % width;
+    y = (i - x)/width;
+    /*
+      Where i is the current cell:
+       A1 | A2 | A3
+      ----|----|----
+       B1 | i  | B3
+      ----|----|----
+       C1 | C2 | C3
+    */
+    if (x > 0) {
+      if (base_map[i-1] == livecell) surround++; // B1
+      if (y > 0) {
+        if (base_map[i-width-1] == livecell) surround++; // A1
+      }
+      if (y < height) {
+        if (base_map[i-1+width] == livecell) surround++; // C1
+      }
+    }
+    if (x < width - 1) {
+      if (base_map[i+1] == livecell) surround++; // B3
+      if (y > 0) {
+        if (base_map[i+1-width] == livecell) surround++; // A3
+      }
+      if (y < height) {
+        if (base_map[i+1+width] == livecell) surround++; // C3
+      }
+    }
+    if (y > 0) {
+      if (base_map[i-width] == livecell) surround++;
+    }
+    if (y < height) {
+      if (base_map[i+width] == livecell) surround++;
+    }
+    if (base_map[i] == deadcell) {
+      if ((ruleint & (1 << surround)) == (1 << surround)) {
+        intermap[i] = livecell;
+      }
+    } else if (base_map[i] == livecell) {
+      if ((ruleint & (1 << (surround + 9))) != (1 << (surround + 9))) {
+        intermap[i] = deadcell;
+      }
+    }
+  }
   // Rewrite map
   memcpy(base_map, intermap, (width*height)+1);
   free(intermap);
@@ -14,8 +65,10 @@ int main (int argc, char * argv[]) {
   unsigned int RULE = 0;
   int rule_size = 0;
   char * rulestr = NULL;
+  if (argc == 1) {
   printf("Rule Integer: ");
   getline(&rulestr, (size_t *) &rule_size, stdin);
+  } else if (argc > 1) rulestr = argv[1];
   RULE = atoi(rulestr);
   if (RULE > 262143) {
     fprintf(stderr, "Invalid integer\n");
@@ -25,8 +78,15 @@ int main (int argc, char * argv[]) {
   int ch = 0;
   int width = 36;
   int height = 18;
+  int playing = 0;
+  unsigned int delay = 0; // Counts up to 10 so display is slow
   int livecell = '#';
   int deadcell = '.';
+  if (argc > 3) {
+    width = atoi(argv[2]);
+    height = atoi(argv[3]);
+  }
+  if (argc > 4) delay = atoi(argv[4]);
   char * map = NULL;
   map = malloc((height * width)+1);
   memset(map, 0, height * width + 1);
@@ -41,31 +101,41 @@ int main (int argc, char * argv[]) {
   noecho();
   while (ch != 'q') {
     erase();
-    if (ch == KEY_UP) {
-      if (y > 0) y--;
-    } else if (ch == KEY_DOWN) {
-      if (y < height - 1) y++;
-    } else if (ch == KEY_LEFT) {
-      if (x > 0) x--;
-    } else if (ch == KEY_RIGHT) {
-      if (x < width - 1) x++;
-    } else if (ch == KEY_A1) {
-      if (x > 0) x--;
-      if (y > 0) y--;
-    } else if (ch == KEY_A3) {
-      if (x < width - 1) x++;
-      if (y > 0) y--;
-    } else if (ch == KEY_C1) {
-      if (x > 0) x--;
-      if (y < height - 1) y++;
-    } else if (ch == KEY_C3) {
-      if (x < width - 1) x++;
-      if (y < height - 1) y++;
-    } else if (ch == ' ') {
-      if (map[y*width+x] == deadcell) {
-        map[y*width+x] = livecell;
-      } else if (map[y*width+x] == livecell) {
-        map[(y*width)+x] = deadcell;
+    if (playing == FALSE) {
+      if (ch == KEY_UP) {
+        if (y > 0) y--;
+      } else if (ch == KEY_DOWN) {
+        if (y < height - 1) y++;
+      } else if (ch == KEY_LEFT) {
+        if (x > 0) x--;
+      } else if (ch == KEY_RIGHT) {
+        if (x < width - 1) x++;
+      } else if (ch == KEY_A1) {
+        if (x > 0) x--;
+        if (y > 0) y--;
+      } else if (ch == KEY_A3) {
+        if (x < width - 1) x++;
+        if (y > 0) y--;
+      } else if (ch == KEY_C1) {
+        if (x > 0) x--;
+        if (y < height - 1) y++;
+      } else if (ch == KEY_C3) {
+        if (x < width - 1) x++;
+        if (y < height - 1) y++;
+      } else if (ch == ' ') {
+        if (map[y*width+x] == deadcell) {
+          map[y*width+x] = livecell;
+        } else if (map[y*width+x] == livecell) {
+          map[(y*width)+x] = deadcell;
+        }
+      } else if (ch == '\n') {
+        playing = TRUE;
+        timeout(50);
+      }
+    } else {
+      if (ch == '\n') {
+        playing = FALSE;
+        timeout(-1);
       }
     }
     for (int i = 0; i < height; ++i) {
@@ -79,9 +149,16 @@ int main (int argc, char * argv[]) {
         printw("%.*s\n", width, (map + (i * width)));
       }
     }
+    printw("(%d, %d)\n", x, y);
     refresh();
+    if (playing == TRUE) {
+      delay++;
+      if (delay == 10) {
+        delay = 0;
+        update_map(map, width, height, livecell, deadcell, RULE);
+      }
+    }
     ch = getch();
-    usleep(50);
   }
   endwin();
   free(map);