Simplified meta_keys() interface by managing all windows stuff below World struct.

[plomrogue] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index 875e11919802986054ef9eeca71ede9646f8e07c..a4781c9f72d90b848283c69433b7f75450c7a53f 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -114,28 +114,37 @@ extern uint16_t center_offset(uint16_t pos, uint16_t mapsize,
 
 extern void turn_over(struct World * world, char action)
 {
-    char * err_open  = "Error recording move: "
-                       "Unable to open file 'record_tmp' for appending.";
-    char * err_write = "Error recording move: "
-                       "Trouble writing to opened file 'record_tmp'.";
-    char * err_close = "Error recording move: "
-                       "Unable to close opened file 'record_tmp'.";
-    char * err_unl   = "Error recording move: "
-                       "Unable to unlink old file 'record'.";
-    char * err_move  = "Error recording move: "
-                        "Unable to rename file 'record_tmp' to 'record'.";
+    char * err_open  = "Trouble in turn_over() with fopen() "
+                       "opening file 'record_tmp' for appending.";
+    char * err_write = "Trouble in turn_over() with write_uint8() "
+                       "writing to opened file 'record_tmp'.";
+    char * err_close = "Trouble in turn_over() with fclose() "
+                       "closing opened file 'record'.";
+    char * err_unl   = "Trouble in turn_over() with unlink() "
+                       "unlinking old file 'record'.";
+    char * err_move  = "Trouble in turn_over() with rename() "
+                       "renaming file 'record_tmp' to 'record'.";
     char * recordfile_tmp = "record_tmp";
     char * recordfile     = "record";
     if (1 == world->interactive)
     {
-        FILE * file = fopen(recordfile_tmp, "a");
-        exit_err(0 == file, world, err_open);
-        exit_err(write_uint8(action, file), world, err_write);
-        exit_err(fclose(file), world, err_close);
+        FILE * file_old = fopen(recordfile, "r");
+        FILE * file_new = fopen(recordfile_tmp, "w");
+        exit_err(0 == file_old, world, err_open);
+        char c = fgetc(file_old);
+        while (EOF != c)
+        {
+            exit_err(write_uint8(c, file_new), world, err_write);
+            c = fgetc(file_old);
+        }
+        exit_err(fclose(file_old), world, err_close);
+        exit_err(write_uint8(action, file_new), world, err_write);
+        err_close = "Trouble in turn_over() with fclose() "
+                    "closing opened file 'record_tmp'.";
+        exit_err(fclose(file_new), world, err_close);
         exit_err(unlink(recordfile), world, err_unl);
         exit_err(rename(recordfile_tmp, recordfile), world, err_move);
     }
-
     world->turn++;
     rrand_seed(world->seed * world->turn);
     struct Monster * monster;
@@ -151,22 +160,23 @@ extern void turn_over(struct World * world, char action)
 
 extern void save_game(struct World * world)
 {
-    char * err_open  = "Error saving game: "
-                       "Unable to open file 'savefile_tmp' for writing.";
-    char * err_write = "Error saving game: "
-                       "Trouble writing to opened file 'savefile_tmp'.";
-    char * err_close = "Error saving game: "
-                       "Unable to close opened file 'savefile_tmp'.";
-    char * err_unl   = "Error saving game: "
-                       "Unable to unlink old 'savefile' file.";
-    char * err_move  = "Error saving game: "
-                        "Unable to rename 'file savefile_tmp' to 'savefile'.";
+    char * err_open  = "Trouble in save_game() with fopen() "
+                       "opening file 'savefile_tmp' for writing.";
+    char * err_write = "Trouble in save_game() "
+                       "writing to opened file 'savefile_tmp'.";
+    char * err_close = "Trouble in save_game() with fclose() "
+                       "closing opened file 'savefile_tmp'.";
+    char * err_unl   = "Trouble in save_game() with unlink() "
+                       "unlinking old 'savefile' file.";
+    char * err_move  = "Trouble in save_game() with rename() "
+                       "renaming 'file savefile_tmp' to 'savefile'.";
     char * savefile_tmp = "savefile_tmp";
     char * savefile     = "savefile";
     FILE * file = fopen(savefile_tmp, "w");
     exit_err(0 == file, world, err_open);
     if (   write_uint32_bigendian(world->seed, file)
         || write_uint32_bigendian(world->turn, file)
+        || write_uint16_bigendian(world->score, file)
         || write_uint16_bigendian(world->player->pos.y + 1, file)
         || write_uint16_bigendian(world->player->pos.x + 1, file)
         || write_uint8(world->player->hitpoints, file)
@@ -254,14 +264,17 @@ extern struct yx_uint16 find_passable_pos(struct Map * map)
 
 
 
-extern uint8_t 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)
+extern uint8_t meta_keys(int key, struct World * world)
 {
-    char * err_toggle = "Trouble toggling window.";
-    char * err_shift  = "Trouble shifting window.";
-    char * err_resize = "Trouble resizing window.";
+    struct WinMeta * win_meta = world->wins.meta;
+    struct Win * win_keys     = world->wins.keys;
+    struct Win * win_map      = world->wins.map;
+    struct Win * win_info     = world->wins.info;
+    struct Win * win_log      = world->wins.log;
+    char * err_toggle = "Trouble with toggle_window() in meta_keys().";
+    char * err_shift  = "Trouble with shift_active_win() in meta_keys().";
+    char * err_resize = "Trouble with growshrink_active_window() in "
+                        "meta_keys().";
     if (key == get_action_key(world->keybindings, "quit"))
     {
         return 1;
@@ -292,11 +305,11 @@ extern uint8_t meta_keys(int key, struct World * world,
     }
     else if (key == get_action_key(world->keybindings, "cycle forwards"))
     {
-        cycle_active_win(win_meta, 'n');
+        cycle_active_win(win_meta, 'f');
     }
     else if (key == get_action_key(world->keybindings, "cycle backwards"))
     {
-        cycle_active_win(win_meta, 'p');
+        cycle_active_win(win_meta, 'b');
     }
     else if (key == get_action_key(world->keybindings, "shift forwards"))
     {