X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike.c;h=7b2d159f878b5ea3fa4e5278d5295f5488abbd55;hb=67396848cb5e3e55385a466d7a24a4f68d0a6c9c;hp=20181befccf6b2de2c62d2a74091c4463cd50e2e;hpb=122747fbbdc061942de2fc2bca901a44a6b4ab61;p=plomrogue

diff --git a/roguelike.c b/roguelike.c
index 20181be..7b2d159 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -1,11 +1,23 @@
+#include <stdlib.h>
+#include <limits.h>
+#include <stdint.h>
 #include <ncurses.h>
 #include <string.h>
-#include <stdlib.h>
 #include "windows.h"
 #include "draw_wins.h"
 #include "roguelike.h"
 #include "keybindings.h"
 
+static uint32_t seed = 0;
+
+uint16_t rrand() {
+// Pseudo-random number generator (LGC algorithm). Use instead of rand() to ensure portable predictability.
+  uint32_t a   = 1103515245;      // Values for a and b as recommended by POSIX.1-2001 (see man page rand(3)).
+  uint16_t b   =      12345;
+  uint32_t mod = 2147483648;
+  seed = ((seed * a) + b) % mod;
+  return (seed / 65536); }        // Ignore least significant 16 bits (they are less random).
+
 void toggle_window (struct WinMeta * win_meta, struct Win * win) {
 // Toggle display of window win.
   if (0 != win->curses)
@@ -16,8 +28,8 @@ void toggle_window (struct WinMeta * win_meta, struct Win * win) {
 void growshrink_active_window (struct WinMeta * win_meta, char change) {
 // Grow or shrink active window horizontally or vertically by one cell size.
   if (0 != win_meta->active) {
-    int height = win_meta->active->height;
-    int width = win_meta->active->width;
+    uint16_t height = win_meta->active->height;
+    uint16_t width = win_meta->active->width;
     if      (change == '-')
       height--;
     else if (change == '+')
@@ -36,12 +48,12 @@ struct Map init_map () {
   map.offset_x = 0;
   map.offset_y = 0;
   map.cells = malloc(map.width * map.height);
-  int x, y, ran;
+  uint16_t x, y, ran;
   char terrain;
   for (y = 0; y < map.height; y++)
     for (x = 0; x < map.width; x++) {
       terrain = '.';
-      ran = rand();
+      ran = rrand();
       if (   0 == ran % ((x*x) / 3 + 1)
           || 0 == ran % ((y*y) / 3 + 1)
           || 0 == ran % ((map.width - x - 1) * (map.width - x - 1) / 3 + 1)
@@ -64,7 +76,7 @@ void map_scroll (struct Map * map, char dir) {
 void next_turn (struct World * world) {
 // Increment turn and move enemy.
   world->turn++;
-  char d = rand() % 5;
+  char d = rrand() % 5;
   char ty = world->monster->y;
   char tx = world->monster->x;
   if (1 == d)
@@ -84,16 +96,16 @@ void next_turn (struct World * world) {
 void update_log (struct World * world, char * text) {
 // Update log with new text to be appended.
   char * new_text;
-  int len_old = strlen(world->log);
-  int len_new = strlen(text);
-  int len_whole = len_old + len_new + 1;
+  uint16_t len_old = strlen(world->log);
+  uint16_t len_new = strlen(text);
+  uint16_t len_whole = len_old + len_new + 1;
   new_text = calloc(len_whole, sizeof(char));
   memcpy(new_text, world->log, len_old);
   memcpy(new_text + len_old, text, len_new);
   free(world->log);
   world->log = new_text; }
 
-char is_passable (struct World * world, int x, int y) {
+char is_passable (struct World * world, uint16_t x, uint16_t y) {
 // Check if coordinate on (or beyond) map is accessible to movement.
   char passable = 0;
   if (0 <= x && x < world->map->width && 0 <= y && y < world->map->height)
@@ -142,11 +154,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);
@@ -217,6 +263,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"))