#include "windows.h" /* for structs WinMeta, Win, init_win_meta(),
* draw_all_wins()
*/
-#include "readwrite.h" /* for read_uint32_bigendian](),
+#include "readwrite.h" /* for try_fgetc(), read_uint32_bigendian(),
* write_uint32_bigendian(), try_fopen(), try_fclose(),
- * try_fclose_unlink_rename()
+ * try_fclose_unlink_rename(), try_fgetc_noeof(),
*/
#include "map_objects.h" /* for structs MapObj, init_map_object_defs(),
* build_map_objects(), get_player()
* load_interface_conf(), load_game(), rrand()
*/
#include "wincontrol.h" /* get_win_by_id(), get_winconf_by_win() */
-#include "rexit.h" /* for exit_game(), exit_err() */
+#include "rexit.h" /* for exit_game() */
#include "command_db.h" /* for init_command_db(), is_command_id_shortdsc() */
#include "control.h" /* for control_by_id(), player_control(),
* get_available_keycode_to_action()
world.map_obj_count = 0;
/* For interactive mode, try to load world state from savefile. */
- char * err_r = "Trouble loading game (in main()) / "
- "reading from opened 'savefile'.";
FILE * file;
if (1 == world.interactive && 0 == access(savefile, F_OK))
{
/* For non-interactive mode, try to load world state from record file. */
else
{
- err_r = "Trouble reading from 'record' file (read_uint32_bigendian() "
- "in main()).";
if (0 == world.interactive)
{
file = try_fopen(recordfile, "r", f_name);
- exit_err(read_uint32_bigendian(file, &world.seed), err_r);
+ world.seed = read_uint32_bigendian(file);
}
/* For interactive-mode in newly started world, generate a start seed
else
{
world.seed = time(NULL);
-
- char * err_w = "Trouble recording new seed "
- "(write_uint32_bigendian() in main()) / writing to "
- "file 'record_tmp'.";
file = try_fopen(recordfile_tmp, "w", f_name);
- exit_err(write_uint32_bigendian(world.seed, file), err_w);
+ write_uint32_bigendian(world.seed, file);
try_fclose_unlink_rename(file, recordfile_tmp, recordfile, f_name);
}
world.mapseed = world.seed;
win_map->center = player->pos;
/* Initialize player's inventory selection index to start position. */
- world.inventory_select = 0;
+ world.inventory_sel = 0;
/* Replay mode. */
int key;
{
while (world.turn != start_turn)
{
- action = getc(file);
+ action = try_fgetc(file, f_name);
if (EOF == action)
{
break;
if ( is_command_id_shortdsc(action, "drop")
|| is_command_id_shortdsc(action, "use"))
{
- world.inventory_select = getc(file);
+ world.inventory_sel = try_fgetc_noeof(file, f_name);
}
player_control_by_id(action);
}
if ( EOF != action
&& key == get_available_keycode_to_action("wait"))
{
- action = getc(file);
+ action = try_fgetc(file, f_name);
if (EOF != action)
{
if ( is_command_id_shortdsc(action, "drop")
|| is_command_id_shortdsc(action, "use"))
{
- world.inventory_select = getc(file);
+ world.inventory_sel = try_fgetc_noeof(file, f_name);
}
player_control_by_id(action);
}