Added bottom status bar and entry arealife-1.3.0

Fixed issue in update_map function
Moved update_map function to source file, with attached header
Added function to print warranty
Added multiple windows
Get screen size from LINES/COLS instead of getmaxyx macro
Added help key
Added foreach macro
Added macro to print onto status bar nicely
Removed unistd include
Change ruleint at runtime
Updated Makefile.am for new sources and headers

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

9 files changed, 272 insertions, 99 deletions

diff --git a/ChangeLog b/ChangeLog
index aa34607..9381b17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2018-07-17  Aiden Woodruff  <aiden.woodruff@gmail.com>
+
+        * update_map.c: File created
+        (update_map): Function moved from update_map.h
+        Fixed error with height
+        Use strcpy instead of memcpy
+
+        * update_map.h: Added #define guard
+
+        * menus.h: File added
+
+        * menus.c: File added
+        (print_copying_warranty): Print out warranty (part 15) to any window.
+
+        * life.h: Don't need unistd.h
+        Include menus.h
+
+        * life.c: Change uppercase characters to lowercase
+        Added stars on multiline boilerplate
+        Added windows for the stat bar and entry line
+        Get winsize from COLS and LINES instead of getmaxyx macro
+        Normal timeout variable added
+        TRUE and FALSE definitions removed
+        Added macro to pretty-print text onto status bar
+        Added macro to run function on list of items
+        Don't need to duplicate things that run when running is TRUE and when it's FALSE, ie ',' and '.' tests
+        Added runtime RULE change
+        Added help key
+        Added Warranty print key
+        Game is printed onto board WINDOW, not main screen
+        (read_num): Read a number from (usually) entry WINDOW
+
+        * Makefile.am: Added new sources and new headers
+
 2018-02-25  Aiden Woodruff  <aiden.woodruff@gmail.com>
 
         * README.md: File created.
diff --git a/Makefile.am b/Makefile.am
index 1c79fa7..6f21a9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AM_OPTIONS = gnu
 bin_PROGRAMS = life
-life_SOURCES = life.c cmdline-life.c
+life_SOURCES = life.c cmdline-life.c updatemap.c menus.c
 life_CFLAGS = -I$(srcdir)
-include_HEADERS = life.h updatemap.h cmdline-life.h
+include_HEADERS = life.h updatemap.h menus.h cmdline-life.h
diff --git a/Makefile.in b/Makefile.in
index a689ab4..ad31e4a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -103,7 +103,8 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_life_OBJECTS = life-life.$(OBJEXT) life-cmdline-life.$(OBJEXT)
+am_life_OBJECTS = life-life.$(OBJEXT) life-cmdline-life.$(OBJEXT) \
+        life-updatemap.$(OBJEXT) life-menus.$(OBJEXT)
 life_OBJECTS = $(am_life_OBJECTS)
 life_LDADD = $(LDADD)
 life_LINK = $(CCLD) $(life_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
@@ -306,9 +307,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_OPTIONS = gnu
-life_SOURCES = life.c cmdline-life.c
+life_SOURCES = life.c cmdline-life.c updatemap.c menus.c
 life_CFLAGS = -I$(srcdir)
-include_HEADERS = life.h updatemap.h cmdline-life.h
+include_HEADERS = life.h updatemap.h menus.h cmdline-life.h
 all: config.h
         $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -417,6 +418,8 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/life-cmdline-life.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/life-life.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/life-menus.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/life-updatemap.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -459,6 +462,34 @@ life-cmdline-life.obj: cmdline-life.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='cmdline-life.c' object='life-cmdline-life.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(life_CFLAGS) $(CFLAGS) -c -o life-cmdline-life.obj `if test -f 'cmdline-life.c'; then $(CYGPATH_W) 'cmdline-life.c'; else $(CYGPATH_W) '$(srcdir)/cmdline-life.c'; fi`
+
+life-updatemap.o: updatemap.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(life_CFLAGS) $(CFLAGS) -MT life-updatemap.o -MD -MP -MF $(DEPDIR)/life-updatemap.Tpo -c -o life-updatemap.o `test -f 'updatemap.c' || echo '$(srcdir)/'`updatemap.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/life-updatemap.Tpo $(DEPDIR)/life-updatemap.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='updatemap.c' object='life-updatemap.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(life_CFLAGS) $(CFLAGS) -c -o life-updatemap.o `test -f 'updatemap.c' || echo '$(srcdir)/'`updatemap.c
+
+life-updatemap.obj: updatemap.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(life_CFLAGS) $(CFLAGS) -MT life-updatemap.obj -MD -MP -MF $(DEPDIR)/life-updatemap.Tpo -c -o life-updatemap.obj `if test -f 'updatemap.c'; then $(CYGPATH_W) 'updatemap.c'; else $(CYGPATH_W) '$(srcdir)/updatemap.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/life-updatemap.Tpo $(DEPDIR)/life-updatemap.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='updatemap.c' object='life-updatemap.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(life_CFLAGS) $(CFLAGS) -c -o life-updatemap.obj `if test -f 'updatemap.c'; then $(CYGPATH_W) 'updatemap.c'; else $(CYGPATH_W) '$(srcdir)/updatemap.c'; fi`
+
+life-menus.o: menus.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(life_CFLAGS) $(CFLAGS) -MT life-menus.o -MD -MP -MF $(DEPDIR)/life-menus.Tpo -c -o life-menus.o `test -f 'menus.c' || echo '$(srcdir)/'`menus.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/life-menus.Tpo $(DEPDIR)/life-menus.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='menus.c' object='life-menus.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(life_CFLAGS) $(CFLAGS) -c -o life-menus.o `test -f 'menus.c' || echo '$(srcdir)/'`menus.c
+
+life-menus.obj: menus.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(life_CFLAGS) $(CFLAGS) -MT life-menus.obj -MD -MP -MF $(DEPDIR)/life-menus.Tpo -c -o life-menus.obj `if test -f 'menus.c'; then $(CYGPATH_W) 'menus.c'; else $(CYGPATH_W) '$(srcdir)/menus.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/life-menus.Tpo $(DEPDIR)/life-menus.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='menus.c' object='life-menus.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(life_CFLAGS) $(CFLAGS) -c -o life-menus.obj `if test -f 'menus.c'; then $(CYGPATH_W) 'menus.c'; else $(CYGPATH_W) '$(srcdir)/menus.c'; fi`
 install-includeHEADERS: $(include_HEADERS)
         @$(NORMAL_INSTALL)
         @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
diff --git a/life.c b/life.c
index e52a6c5..c8fbc63 100644
--- a/life.c
+++ b/life.c
@@ -1,28 +1,58 @@
 /*
-    An arbitrary cellular automata model using ncurses
-    Copyright (C) 2018 Aiden Woodruff
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+ * An arbitrary cellular automata model using ncurses
+ * Copyright (C) 2018 Aiden Woodruff
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ */
 #include "life.h"
 
-// Declare TRUE and FALSE
-#ifndef TRUE
-#define TRUE (1==1)
-#define FALSE (!TRUE)
+#ifndef stat_bar_print
+// Print text to status bar in the nice way, without erasing or refreshing
+#define stat_bar_print(win,fmt,...)                                     \
+  wstandout(win);                                                       \
+  wprintw(win, fmt, ##__VA_ARGS__);                                     \
+  for (int _i = getcurx(win); _i < COLS; _i++) waddch(win, ' ');        \
+  wstandend(stat_bar);
+#endif
+
+#ifndef foreach
+#define foreach(func,count,first,...)                           \
+  {typeof(first) things[] = {__VA_ARGS__};                      \
+    func(first);                                                \
+    for (int _i = 0; _i < count - 1; _i++) func(things[_i]);}
 #endif
 
+int read_num (WINDOW * win, int min, int max) {
+  int ret = 0;
+  werase(win);
+  char * text = (char*) malloc((size_t)(COLS + 1));
+  memset(text, 0, (size_t)(COLS + 1));
+  curs_set(1);
+  echo();
+  wgetnstr(win, text, (size_t)(COLS + 1));
+  ret = (int) strtol((const char *) text, NULL, 10);
+  if (!(ret >= min && ret <= max)) {
+    ret = 0;
+  }
+  noecho();
+  curs_set(0);
+  free(text);
+  return ret;
+}
+
 int main (int argc, char * argv[]) {
   unsigned int RULE = 0;
   struct gengetopt_args_info args_info;
@@ -35,6 +65,7 @@ int main (int argc, char * argv[]) {
   RULE = args_info.ruleint_arg;
   srand(time(NULL));
   int ch = 0;
+  int timeout_val = 50;
   int width = 36;
   int height = 18;
   int playing = 0;
@@ -63,11 +94,13 @@ int main (int argc, char * argv[]) {
     }
   }
   if (args_info.maximize_given) {
-    getmaxyx(stdscr, height, width);
-    width -= 1;
-    height -= 2;
+    width = COLS - 1;
+    height = LINES - 2;
   }
   cmdline_parser_free(&args_info);
+  WINDOW * board = newwin(height, width + 1, 0, 0);
+  WINDOW * stat_bar = newwin(1, 0, LINES - 2, 0);
+  WINDOW * entry = newwin(1, 0, LINES - 1, 0);
   char * map = NULL;
   map = malloc((height * width)+1);
   memset(map, 0, height * width + 1);
@@ -76,7 +109,11 @@ int main (int argc, char * argv[]) {
   int y = height/2;
   while (ch != 'q') {
     erase();
+    werase(board);
+    werase(stat_bar);
+    werase(entry);
     if (playing == FALSE) {
+      // Numpad and arrow directions
       if (ch == KEY_UP) {
         if (y > 0) y--;
       } else if (ch == KEY_DOWN) {
@@ -105,37 +142,81 @@ int main (int argc, char * argv[]) {
         }
       } else if (ch == '\n') {
         playing = TRUE;
-        timeout(50);
+        timeout(timeout_val);
       } else if (ch == 'c') {
         memset(map, deadcell, width*height);
-      } else if (ch == ',') {
-        delaymax -= (delaymax > 1 ? 1 : 0);
-      } else if (ch == '.') {
-        delaymax += (delaymax < 20 ? 1 : 0);
+      } else if (ch == 'r') {
+        werase(stat_bar);
+        stat_bar_print(stat_bar, "Rule int - Current: %d - Default: 6152 - Max: 262143", RULE);
+        wrefresh(stat_bar);
+        {
+          int old_rule = RULE;
+          RULE = read_num(entry, 0, 262143);
+          if (RULE == 0) {
+            RULE = old_rule;
+          }
+        }
+        werase(stat_bar);
+        werase(entry);
+      } else if (keyname(ch) == "^R") {
+        // Fancy rule selection
+        // TODO (aiden.woodruff@gmail.com) Write
+      } else if (ch == 'h') {
+        timeout(-1);
+        erase();
+        foreach(werase, 3, board, stat_bar, entry);
+        stat_bar_print(stat_bar, "Press any key to return");
+        printw("Arrow keys - Motion\n");
+        printw("Space - Flip cell (if it's alive, to dead, and vice versa)\n");
+        printw("Enter - Pause/Play\n");
+        printw("\tN.B. - Many keys can only be used while paused.\n");
+        printw(", - Lower delay time\n");
+        printw(". - Increase delay time\n");
+        printw("R - Input a rule-int\n");
+        // TODO printw("Ctrl+R - Open the fancy rule menu\n");
+        printw("W - Show warranty\n");
+        printw("V - Print version\n");
+        foreach(wnoutrefresh, 3, stdscr, entry, stat_bar);
+        doupdate();
+        getch();
+        timeout(timeout_val);
+      } else if (ch == 'w') {
+        timeout(-1);
+        foreach(werase, 4, stdscr, board, stat_bar, entry);
+        stat_bar_print(stat_bar, "Press any key to return");
+        print_copying_warranty(stdscr);
+        foreach(wnoutrefresh, 3, stdscr, entry, stat_bar);
+        doupdate();
+        getch();
+        timeout(timeout_val);
       }
-    } else {
+    } else { // ie PLAYING == TRUE
       if (ch == '\n') {
         playing = FALSE;
         timeout(-1);
-      } else if (ch == ',') {
-        delaymax -= (delaymax > 1 ? 1 : 0);
-      } else if (ch == '.') {
-        delaymax += (delaymax < 20 ? 1 : 0);
       }
     }
+
+    // Commands that don't depend on state
+    if (ch == ',') {
+      delaymax -= (delaymax > 1 ? 1 : 0);
+    } else if (ch == '.') {
+      delaymax += (delaymax < 20 ? 1 : 0);
+    }
     for (int i = 0; i < height; ++i) {
       if (i == y) {
-        printw("%.*s", x, map + (y * width));
-        standout();
-        printw("%.1s", map + (y * width) + x);
-        standend();
-        printw("%.*s\n", width-(x+1), (map + (i * width) + x + 1));
+        wprintw(board, "%.*s", x, map + (y * width));
+        wstandout(board);
+        wprintw(board, "%.1s", map + (y * width) + x);
+        wstandend(board);
+        wprintw(board, "%.*s\n", width-(x+1), (map + (i * width) + x + 1));
       } else {
-        printw("%.*s\n", width, (map + (i * width)));
+        wprintw(board, "%.*s\n", width, (map + (i * width)));
       }
     }
-    printw("(%d, %d)\t\tGeneration: %d\t\tDelay Time: %d\n", x, y, generation, delaymax);
-    refresh();
+    stat_bar_print(stat_bar, "(%d, %d)\t\tGeneration: %d\t\tDelay Time: %d\n", x, y, generation, delaymax);
+    foreach(wnoutrefresh, 4, stdscr, board, entry, stat_bar);
+    doupdate();
     if (playing == TRUE) {
       delay++;
       if (delay >= delaymax) {
@@ -145,6 +226,9 @@ int main (int argc, char * argv[]) {
       }
     }
     ch = getch();
+    if (ch <= 'Z' && ch >= 'A') {
+      ch -= ('A' - 'a');
+    }
   }
   endwin();
   free(map);
diff --git a/life.h b/life.h
index 44ded1c..7afdc69 100644
--- a/life.h
+++ b/life.h
@@ -3,7 +3,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
-#include <unistd.h>
 
 // Module Libraries
 #include <ncurses.h>
@@ -11,3 +10,4 @@
 // Project Libraries
 #include "cmdline-life.h"
 #include "updatemap.h"
+#include "menus.h"
diff --git a/menus.c b/menus.c
new file mode 100644
index 0000000..189a69b
--- /dev/null
+++ b/menus.c
@@ -0,0 +1,7 @@
+#include "menus.h"
+
+int print_copying_warranty (WINDOW * win) {
+  int width = getmaxx(win);
+  const char * WARRANTY = "  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.\n  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.\n  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.\n  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.";
+  return wprintw(win, WARRANTY);
+}
diff --git a/menus.h b/menus.h
new file mode 100644
index 0000000..567ae19
--- /dev/null
+++ b/menus.h
@@ -0,0 +1,8 @@
+#include <ncurses.h>
+
+#ifndef LIFE_MENUS_H_
+#define LIFE_MENUS_H_
+
+int print_copying_warranty (WINDOW * win);
+
+#endif // LIFE_MENUS_H_
diff --git a/updatemap.c b/updatemap.c
new file mode 100644
index 0000000..d33b05a
--- /dev/null
+++ b/updatemap.c
@@ -0,0 +1,57 @@
+#include "updatemap.h"
+
+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);
+  memset(intermap, 0, (width*height)+1);
+  strcpy(intermap, base_map);
+  // 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 - 1) {
+        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 - 1) {
+        if (base_map[i+1+width] == livecell) surround++; // C3
+      }
+    }
+    if (y > 0) {
+      if (base_map[i-width] == livecell) surround++;
+    }
+    if (y < height - 1) {
+      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
+  strcpy(base_map, intermap);
+  free(intermap);
+  return base_map;
+}
diff --git a/updatemap.h b/updatemap.h
index 366213b..5c5bb8d 100644
--- a/updatemap.h
+++ b/updatemap.h
@@ -1,56 +1,8 @@
-#include <stdlib.h>
+#include <string.h>
 
-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);
-  return base_map;
-}
+#ifndef LIFE_UPDATEMAP_H_
+#define LIFE_UPDATEMAP_H_
+
+char * update_map (char * base_map, const int width, const int height, char livecell, char deadcell, const unsigned int ruleint);
+
+#endif // LIFE_UPDATEMAP_H_