X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc.c;h=a4781c9f72d90b848283c69433b7f75450c7a53f;hb=caf7e50574dc4fb3756a386257863e5b8b42ad98;hp=238da3eca884c084d72eebc4ad4c8a4cb9c81b9f;hpb=3ba2e97b20baea88bd6738e95b9c592c9cf07520;p=plomrogue
diff --git a/src/misc.c b/src/misc.c
index 238da3e..a4781c9 100644
--- 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)
@@ -254,11 +264,13 @@ 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)
{
+ 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 "
@@ -297,7 +309,7 @@ extern uint8_t meta_keys(int key, struct World * world,
}
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"))
{