Moved meta_keys() into new library "control" to soon include all key-press processing.

[plomrogue] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index 8a782732a1621adbbd56f253b29b3a370a475cd8..1fbcc3ecdce4a318e911e75928c1322e29d19c8f 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -119,7 +119,7 @@ extern void turn_over(struct World * world, char action)
     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_tmp'.";
+                       "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() "
@@ -128,14 +128,23 @@ extern void turn_over(struct World * world, char action)
     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;
@@ -167,6 +176,7 @@ extern void save_game(struct World * world)
     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)
@@ -251,113 +261,3 @@ extern struct yx_uint16 find_passable_pos(struct Map * map)
     }
     return pos;
 }
-
-
-
-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)
-{
-    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;
-    }
-    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"))
-    {
-        exit_err(toggle_window(win_meta, win_keys), world, err_toggle);
-    }
-    else if (key == get_action_key(world->keybindings, "toggle map window"))
-    {
-        exit_err(toggle_window(win_meta, win_map), world, err_toggle);
-    }
-    else if (key == get_action_key(world->keybindings, "toggle info window"))
-    {
-        exit_err(toggle_window(win_meta, win_info), world, err_toggle);
-    }
-    else if (key == get_action_key(world->keybindings, "toggle log window"))
-    {
-        exit_err(toggle_window(win_meta, win_log), world, err_toggle);
-    }
-    else if (key == get_action_key(world->keybindings, "cycle forwards"))
-    {
-        cycle_active_win(win_meta, 'f');
-    }
-    else if (key == get_action_key(world->keybindings, "cycle backwards"))
-    {
-        cycle_active_win(win_meta, 'b');
-    }
-    else if (key == get_action_key(world->keybindings, "shift forwards"))
-    {
-        exit_err(shift_active_win(win_meta, 'f'), world, err_shift);
-    }
-    else if (key == get_action_key(world->keybindings, "shift backwards"))
-    {
-        exit_err(shift_active_win(win_meta, 'b'), world, err_shift);
-    }
-    else if (key == get_action_key(world->keybindings, "grow horizontally"))
-    {
-        exit_err(growshrink_active_window(win_meta, '*'), world, err_resize);
-    }
-    else if (key == get_action_key(world->keybindings, "shrink horizontally"))
-    {
-        exit_err(growshrink_active_window(win_meta, '_'), world, err_resize);
-    }
-    else if (key == get_action_key(world->keybindings, "grow vertically"))
-    {
-        exit_err(growshrink_active_window(win_meta, '+'), world, err_resize);
-    }
-    else if (key == get_action_key(world->keybindings, "shrink vertically"))
-    {
-        exit_err(growshrink_active_window(win_meta, '-'), world, err_resize);
-    }
-    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, NORTH, win_map->frame.size);
-     }
-    else if (key == get_action_key(world->keybindings, "map down"))
-    {
-        map_scroll (world->map, SOUTH, win_map->frame.size);
-    }
-    else if (key == get_action_key(world->keybindings, "map right"))
-    {
-        map_scroll (world->map, EAST, win_map->frame.size);
-    }
-    else if (key == get_action_key(world->keybindings, "map left"))
-    {
-        map_scroll (world->map, WEST, win_map->frame.size);
-    }
-    else if (key == get_action_key(world->keybindings, "map center player"))
-    {
-        map_center_player (world->map, world->player, win_map->frame.size);
-    }
-    return 0;
-}