X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike.c;h=f648e00cd769369adf21cb35aaaca107f1ca1596;hb=676d45b3139bcaab1a032addc24645d8055cb2ca;hp=0279043ecd1d427a39b6e3c3a13729ddc2fe4eda;hpb=231090b75bf54933f8016781c9c3f83e6ba3d669;p=plomrogue

diff --git a/roguelike.c b/roguelike.c
index 0279043..f648e00 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -54,17 +54,6 @@ void write_uint32_bigendian(uint32_t x, FILE * file) {
   fputc(c, file);
   fputc(d, file); }
 
-void load_game(struct World * world) {
-// Load game data from game file.
-  FILE * file = fopen("savefile", "r");
-  world->seed = read_uint32_bigendian(file);
-  world->turn = read_uint32_bigendian(file);
-  world->player->y = read_uint16_bigendian(file);
-  world->player->x = read_uint16_bigendian(file);
-  world->monster->y = read_uint16_bigendian(file);
-  world->monster->x = read_uint16_bigendian(file);
-  fclose(file); }
-
 void save_game(struct World * world) {
 // Save game data to game file.
   FILE * file = fopen("savefile", "w");
@@ -83,6 +72,13 @@ void toggle_window (struct WinMeta * win_meta, struct Win * win) {
   else
     append_window(win_meta, win); }
 
+void scroll_pad (struct WinMeta * win_meta, char dir) {
+// Try to scroll pad left or right.
+  if      ('+' == dir)
+    reset_pad_offset(win_meta, win_meta->pad_offset + 1);
+  else if ('-' == dir)
+    reset_pad_offset(win_meta, win_meta->pad_offset - 1); }
+
 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) {
@@ -105,19 +101,25 @@ struct Map init_map () {
   map.height = 64;
   map.offset_x = 0;
   map.offset_y = 0;
-  map.cells = malloc(map.width * map.height);
-  uint16_t x, y, ran;
-  char terrain;
+  uint32_t size = map.width * map.height;
+  map.cells = malloc(size);
+  uint16_t y, x;
   for (y = 0; y < map.height; y++)
-    for (x = 0; x < map.width; x++) {
-      terrain = '.';
-      ran = rrand(0, 0);
-      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)
-          || 0 == ran %((map.height - y - 1) * (map.height - y - 1) / 3 + 1))
-        terrain = ' ';
-      map.cells[(y * map.width) + x] = terrain; }
+    for (x = 0; x < map.width; x++)
+      map.cells[(y * map.width) + x] = '~';
+  map.cells[size / 2 + (map.width / 2)] = '.';
+  uint32_t repeats, root, curpos;
+  for (root = 0; root * root * root < size; root++);
+  for (repeats = 0; repeats < size * root; repeats++) {
+    y = rrand(0, 0) % map.height;
+    x = rrand(0, 0) % map.width;
+    curpos = y * map.width + x;
+    if ('~' == map.cells[curpos] &&
+        (   (curpos >= map.width && '.' == map.cells[curpos - map.width])
+         || (curpos < map.width * (map.height-1) && '.' == map.cells[curpos + map.width])
+         || (curpos > 0 && curpos % map.width != 0 && '.' == map.cells[curpos-1])
+         || (curpos < (map.width * map.height) && (curpos+1) % map.width != 0 && '.' == map.cells[curpos+1])))
+      map.cells[y * map.width + x] = '.'; }
   return map; }
 
 void map_scroll (struct Map * map, char dir) {
@@ -148,7 +150,7 @@ void next_turn (struct World * world) {
     tx--;
   if (tx == world->player->x && ty == world->player->y)
     update_log(world, "\nThe monster hits you.");
-  else if (is_passable(world, tx, ty)) {
+  else if (is_passable(world->map, ty, tx)) {
     world->monster->y = ty;
     world->monster->x = tx; } }
 
@@ -164,14 +166,20 @@ void update_log (struct World * world, char * text) {
   free(world->log);
   world->log = new_text; }
 
-char is_passable (struct World * world, uint16_t x, uint16_t y) {
+char is_passable (struct Map * map, uint16_t y, uint16_t x) {
 // 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)
-    if ('.' == world->map->cells[y * world->map->width + x])
+  if (0 <= x && x < map->width && 0 <= y && y < map->height)
+    if ('.' == map->cells[y * map->width + x])
       passable = 1;
   return passable; }
 
+void record_action (char action) {
+// Append action to game record file.
+  FILE * file = fopen("record", "a");
+  fputc(action, file);
+  fclose(file); }
+
 void move_player (struct World * world, char d) {
 // Move player in direction d, increment turn counter and update log.
   static char prev = 0;
@@ -193,7 +201,7 @@ void move_player (struct World * world, char d) {
     tx++; }
   if (ty == world->monster->y && tx == world->monster->x)
     success = 2;
-  else if (is_passable(world, tx, ty)) {
+  else if (is_passable(world->map, ty, tx)) {
     success = 1;
     world->player->y = ty;
     world->player->x = tx; }
@@ -211,16 +219,83 @@ void move_player (struct World * world, char d) {
       update_log (world, msg);
       free(msg); } }
   prev = success * d;
+  if (1 == world->interactive)
+    record_action(d);
   next_turn (world); }
 
 void player_wait (struct World * world) {
 // Make player wait one turn.
+  if (1 == world->interactive)
+    record_action(0);
   next_turn (world);
   update_log (world, "\nYou wait."); }
 
+unsigned char meta_keys(int key, struct World * world, struct WinMeta * win_meta, struct Win * win_keys,
+                        struct Win * win_map, struct Win * win_info, struct Win * win_log) {
+// Call some meta program / window management actions dependent on key. Return 1 to signal quitting.
+  if (key == get_action_key(world->keybindings, "quit"))
+    return 1;
+  else if (key == get_action_key(world->keybindings, "scroll pad right"))
+    scroll_pad (win_meta, '+');
+  else if (key == get_action_key(world->keybindings, "scroll pad left"))
+    scroll_pad (win_meta, '-');
+  else if (key == get_action_key(world->keybindings, "toggle keys window"))
+    toggle_window(win_meta, win_keys);
+  else if (key == get_action_key(world->keybindings, "toggle map window"))
+    toggle_window(win_meta, win_map);
+  else if (key == get_action_key(world->keybindings, "toggle info window"))
+    toggle_window(win_meta, win_info);
+  else if (key == get_action_key(world->keybindings, "toggle log window"))
+    toggle_window(win_meta, win_log);
+  else if (key == get_action_key(world->keybindings, "cycle forwards"))
+    cycle_active_window(win_meta, 'n');
+  else if (key == get_action_key(world->keybindings, "cycle backwards"))
+    cycle_active_window(win_meta, 'p');
+  else if (key == get_action_key(world->keybindings, "shift forwards"))
+    shift_active_window(win_meta, 'f');
+  else if (key == get_action_key(world->keybindings, "shift backwards"))
+    shift_active_window(win_meta, 'b');
+  else if (key == get_action_key(world->keybindings, "grow horizontally"))
+    growshrink_active_window(win_meta, '*');
+  else if (key == get_action_key(world->keybindings, "shrink horizontally"))
+    growshrink_active_window(win_meta, '_');
+  else if (key == get_action_key(world->keybindings, "grow vertically"))
+    growshrink_active_window(win_meta, '+');
+  else if (key == get_action_key(world->keybindings, "shrink vertically"))
+    growshrink_active_window(win_meta, '-');
+  else if (key == get_action_key(world->keybindings, "save keys"))
+    save_keybindings(world);
+  else if (key == get_action_key(world->keybindings, "keys nav up"))
+    keyswin_move_selection (world, 'u');
+  else if (key == get_action_key(world->keybindings, "keys nav down"))
+    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, "map up"))
+    map_scroll (world->map, 'n');
+  else if (key == get_action_key(world->keybindings, "map down"))
+    map_scroll (world->map, 's');
+  else if (key == get_action_key(world->keybindings, "map right"))
+    map_scroll (world->map, 'e');
+  else if (key == get_action_key(world->keybindings, "map left"))
+    map_scroll (world->map, 'w');
+  return 0; }
+
 int main (int argc, char *argv[]) {
   struct World world;
-  init_keybindings(&world);
+  world.interactive = 1;
+  int opt;
+  uint32_t start_turn;
+  while ((opt = getopt(argc, argv, "s::")) != -1) {
+    switch (opt) {
+      case 's':
+        world.interactive = 0;
+        start_turn = 0;
+        if (optarg)
+          start_turn = atoi(optarg);
+        break;
+      default:
+        exit(EXIT_FAILURE); } }
 
   world.log = calloc(1, sizeof(char));
   update_log (&world, " ");
@@ -228,24 +303,43 @@ int main (int argc, char *argv[]) {
   world.player = &player;
   struct Monster monster;
   world.monster = &monster;
-  if (0 == access("savefile", F_OK))
-    load_game(&world);
+  FILE * file;
+  if (1 == world.interactive && 0 == access("savefile", F_OK)) {
+    file = fopen("savefile", "r");
+    world.seed = read_uint32_bigendian(file);
+    world.turn = read_uint32_bigendian(file);
+    player.y = read_uint16_bigendian(file);
+    player.x = read_uint16_bigendian(file);
+    monster.y = read_uint16_bigendian(file);
+    monster.x = read_uint16_bigendian(file);
+    fclose(file); }
   else {
-    player.y = 8;
-    player.x = 8;
-    monster.y = 55;
-    monster.x = 55;
-    world.seed = time(NULL);
-    world.turn = 1; }
+    world.turn = 1;
+    if (0 == world.interactive) {
+      file = fopen("record", "r");
+      world.seed = read_uint32_bigendian(file); }
+    else {
+      file = fopen("record", "w");
+      world.seed = time(NULL);
+      write_uint32_bigendian(world.seed, file);
+      fclose(file); } }
   rrand(1, world.seed);
   struct Map map = init_map();
   world.map = &map;
+  if (1 == world.turn) {
+    for (player.y = player.x = 0; 0 == is_passable(&map, player.y, player.x);) {
+      player.y = rrand(0, 0) % map.height;
+      player.x = rrand(0, 0) % map.width; }
+    for (monster.y = monster.x = 0; 0 == is_passable(&map, monster.y, monster.x);) {
+      monster.y = rrand(0, 0) % map.height;
+      monster.x = rrand(0, 0) % map.width; } }
 
   WINDOW * screen = initscr();
   noecho();
   curs_set(0);
   keypad(screen, TRUE);
   raw();
+  init_keybindings(&world);
   struct WinMeta win_meta = init_win_meta(screen);
   struct Win win_keys = init_window(&win_meta, "Keys", &world, draw_keys_win);
   struct Win win_map = init_window(&win_meta, "Map", &world, draw_map_win);
@@ -261,69 +355,58 @@ int main (int argc, char *argv[]) {
   toggle_window(&win_meta, &win_log);
 
   int key;
-  uint32_t last_turn = 0;
-  while (1) {
-    if (last_turn != world.turn) {
-      save_game(&world);
-      last_turn = world.turn; }
-    draw_all_windows (&win_meta);
-    key = getch();
-    if      (key == get_action_key(world.keybindings, "quit"))
-      break;
-    else if (key == get_action_key(world.keybindings, "scroll pad right"))
-      scroll_pad (&win_meta, '+');
-    else if (key == get_action_key(world.keybindings, "scroll pad left"))
-      scroll_pad (&win_meta, '-');
-    else if (key == get_action_key(world.keybindings, "toggle keys window"))
-      toggle_window(&win_meta, &win_keys);
-    else if (key == get_action_key(world.keybindings, "toggle map window"))
-      toggle_window(&win_meta, &win_map);
-    else if (key == get_action_key(world.keybindings, "toggle info window"))
-      toggle_window(&win_meta, &win_info);
-    else if (key == get_action_key(world.keybindings, "toggle log window"))
-      toggle_window(&win_meta, &win_log);
-    else if (key == get_action_key(world.keybindings, "cycle forwards"))
-      cycle_active_window(&win_meta, 'n');
-    else if (key == get_action_key(world.keybindings, "cycle backwards"))
-      cycle_active_window(&win_meta, 'p');
-    else if (key == get_action_key(world.keybindings, "shift forwards"))
-      shift_active_window(&win_meta, 'f');
-    else if (key == get_action_key(world.keybindings, "shift backwards"))
-      shift_active_window(&win_meta, 'b');
-    else if (key == get_action_key(world.keybindings, "grow horizontally"))
-      growshrink_active_window(&win_meta, '*');
-    else if (key == get_action_key(world.keybindings, "shrink horizontally"))
-      growshrink_active_window(&win_meta, '_');
-    else if (key == get_action_key(world.keybindings, "grow vertically"))
-      growshrink_active_window(&win_meta, '+');
-    else if (key == get_action_key(world.keybindings, "shrink vertically"))
-      growshrink_active_window(&win_meta, '-');
-    else if (key == get_action_key(world.keybindings, "save keys"))
-      save_keybindings(&world);
-    else if (key == get_action_key(world.keybindings, "keys nav up"))
-      keyswin_move_selection (&world, 'u');
-    else if (key == get_action_key(world.keybindings, "keys nav down"))
-      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, "map up"))
-      map_scroll (&map, 'n');
-    else if (key == get_action_key(world.keybindings, "map down"))
-      map_scroll (&map, 's');
-    else if (key == get_action_key(world.keybindings, "map right"))
-      map_scroll (&map, 'e');
-    else if (key == get_action_key(world.keybindings, "map left"))
-      map_scroll (&map, 'w');
-    else if (key == get_action_key(world.keybindings, "player down"))
-      move_player(&world, 's');
-    else if (key == get_action_key(world.keybindings, "player up"))
-      move_player(&world, 'n');
-    else if (key == get_action_key(world.keybindings, "player right"))
-      move_player(&world, 'e');
-    else if (key == get_action_key(world.keybindings, "player left"))
-      move_player(&world, 'w');
-    else if (key == get_action_key(world.keybindings, "wait") )
-      player_wait (&world); }
+  unsigned char quit_called = 0;
+  if (0 == world.interactive) {
+    unsigned char still_reading_file = 1;
+    int action;
+    while (1) {
+      if (start_turn == world.turn)
+        start_turn = 0;
+      if (0 == start_turn) {
+        draw_all_windows (&win_meta);
+        key = getch(); }
+      if (1 == still_reading_file &&
+          (world.turn < start_turn || key == get_action_key(world.keybindings, "wait / next turn")) ) {
+        action = getc(file);
+        if (EOF == action) {
+          start_turn = 0;
+          still_reading_file = 0; }
+        else if (0 == action)
+          player_wait (&world);
+        else if ('s' == action)
+          move_player(&world, 's');
+        else if ('n' == action)
+          move_player(&world, 'n');
+        else if ('e' == action)
+          move_player(&world, 'e');
+        else if ('w' == action)
+          move_player(&world, 'w'); }
+      else
+        quit_called = meta_keys(key, &world, &win_meta, &win_keys, &win_map, &win_info, &win_log);
+        if (1 == quit_called)
+          break; } }
+  else {
+    uint32_t last_turn = 0;
+    while (1) {
+      if (last_turn != world.turn) {
+        save_game(&world);
+        last_turn = world.turn; }
+      draw_all_windows (&win_meta);
+      key = getch();
+      if      (key == get_action_key(world.keybindings, "player down"))
+        move_player(&world, 's');
+      else if (key == get_action_key(world.keybindings, "player up"))
+        move_player(&world, 'n');
+      else if (key == get_action_key(world.keybindings, "player right"))
+        move_player(&world, 'e');
+      else if (key == get_action_key(world.keybindings, "player left"))
+        move_player(&world, 'w');
+      else if (key == get_action_key(world.keybindings, "wait / next turn"))
+        player_wait (&world);
+      else
+        quit_called = meta_keys(key, &world, &win_meta, &win_keys, &win_map, &win_info, &win_log);
+        if (1 == quit_called)
+          break; } }
 
   free(map.cells);
   for (key = 0; key <= world.keyswindata->max; key++)