Added experimental map loading / saving.

diff --git a/keybindings b/keybindings
index cb285c7f82ccf6443d791bfd3c813e08ee494743..9b0f2a12174d4718c365a58ff0c23bbc62634d15 100644 (file)
--- a/keybindings
+++ b/keybindings
@@ -17,6 +17,8 @@
 95 shrink horizontally
 43 grow vertically
 45 shrink vertically
+108 load map
+115 save map
 119 map up
 120 map down
 97 map left

diff --git a/map b/map
new file mode 100644 (file)
index 0000000..8fc90f7
Binary files /dev/null and b/map differ

diff --git a/roguelike.c b/roguelike.c
index 532ae70ec08993b5b8666773e3f725f10a3e1614..cc218a374568531f28b34be530a036be2b6b52d8 100644 (file)
--- a/roguelike.c
+++ b/roguelike.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <limits.h>
 #include <stdint.h>
 #include <ncurses.h>
 #include <string.h>
@@ -143,11 +144,45 @@ void move_player (struct World * world, char d) {
   prev = success * d;
   next_turn (world); }
 
-void player_wait(struct World * world) {
+void player_wait (struct World * world) {
 // Make player wait one turn.
   next_turn (world);
   update_log (world, "\nYou wait."); }
 
+void save_map (struct Map * map) {
+// Save map to file "map".
+  FILE * file = fopen("map", "w");
+  fputc(map->width / CHAR_MAX, file);
+  fputc(map->width % CHAR_MAX, file);
+  uint16_t y, x;
+  for (y = 0; y < map->height; y++)
+    for (x = 0; x < map->width; x++)
+      fputc(map->cells[y * map->width + x], file);
+  fclose(file); }
+
+struct Map load_map () {
+// Load map from file.
+  FILE * file = fopen("map", "r");
+  struct Map map;
+  map.width = (fgetc(file) * CHAR_MAX) + fgetc(file);
+  long pos = ftell(file);
+  int c = fgetc(file);
+  uint32_t i = 0;
+  while (EOF != c) {
+    i++;
+    c = fgetc(file); }
+  map.cells = malloc(i * sizeof(char));
+  map.height = i / map.width;
+  fseek(file, pos, SEEK_SET);
+  c = fgetc(file);
+  i = 0;
+  while (EOF != c) {
+    map.cells[i] = (char) c;
+    c = fgetc(file);
+    i++; }
+  fclose(file);
+  return map; }
+
 int main () {
   struct World world;
   init_keybindings(&world);
@@ -218,6 +253,10 @@ int main () {
       keyswin_move_selection (&world, 'd');
     else if (key == get_action_key(world.keybindings, "keys mod"))
       keyswin_mod_key (&world, &win_meta);
+    else if (key == get_action_key(world.keybindings, "load map"))
+      map = load_map();
+    else if (key == get_action_key(world.keybindings, "save map"))
+      save_map(&map);
     else if (key == get_action_key(world.keybindings, "map up"))
       map_scroll (&map, 'n');
     else if (key == get_action_key(world.keybindings, "map down"))