X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmisc.c;h=cfa43caf14b7054e682d631a20b85e328a1bfbd9;hb=6ba18516a602b3d4ad95981887ad9c5eb40a335a;hp=b3240585e2c6dab2ffc81c77192afc8e0e711347;hpb=111279ad59a25bc548c47d38c1a52c3036eff87a;p=plomrogue
diff --git a/src/misc.c b/src/misc.c
index b324058..cfa43ca 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,9 +1,9 @@
/* misc.c */
#include "misc.h"
-#include /* for exit(), EXIT_SUCCESS define, calloc(), free() */
+#include /* for calloc(), free() */
#include /* for strlen(), strcmp(), memcpy() */
-#include /* for endwin() */
+#include /* for uint8_t */
#include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(),
* resize_active_win(), cycle_active_win(),
* shift_active_win(), struct Win, struct WinMeta
@@ -11,34 +11,14 @@
#include "keybindings.h" /* for get_action_key(), save_keybindings(),
* keyswin_move_selection(), keyswin_mod_key()
*/
-#include "readwrite.h" /* for write_uint16_bigendian(), write_uint32_bigendian()
- */
-#include "map_objects.h" /* for struct Monster, write_map_objects(),
- * write_map_objects_monsterdata()
- */
+#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */
+#include "map_objects.h" /* for struct Monster, write_map_objects(), */
#include "map_object_actions.h" /* for is_passable(), move_monster() */
#include "map.h" /* for map_scroll(),map_center_player(), Map struct,dir enum */
#include "main.h" /* for World struct */
#include "yx_uint16.h" /* for yx_uint16 */
#include "rrand.h" /* for rrand(), rrand_seed() */
-
-
-
-extern void exit_game(struct World * world, struct Map * map)
-{
- endwin();
- free(map->cells);
- uint16_t key;
- for (key = 0; key <= world->keyswindata->max; key++)
- {
- free(world->keybindings[key].name);
- }
- free(world->keybindings);
- free(world->keyswindata);
- free(world->log);
- exit (EXIT_SUCCESS);
-}
-
+#include "rexit.h" /* for exit_err() */
extern void textfile_sizes(FILE * file, uint16_t * linemax_p,
@@ -135,7 +115,7 @@ extern void turn_over(struct World * world, char action)
if (1 == world->interactive)
{
FILE * file = fopen("record", "a");
- fputc(action, file);
+ exit_err(write_uint8(action, file), world, "Record writing failure.");
fclose(file);
}
world->turn++;
@@ -153,14 +133,16 @@ extern void turn_over(struct World * world, char action)
extern void save_game(struct World * world)
{
+ uint8_t err;
FILE * file = fopen("savefile", "w");
- write_uint32_bigendian(world->seed, file);
- write_uint32_bigendian(world->turn, file);
- write_uint16_bigendian(world->player->pos.y + 1, file);
- write_uint16_bigendian(world->player->pos.x + 1, file);
- fputc(world->player->hitpoints, file);
- write_map_objects (world->monster, file, write_map_objects_monsterdata);
- write_map_objects (world->item, file, NULL);
+ err = write_uint32_bigendian(world->seed, file);
+ err = err | write_uint32_bigendian(world->turn, file);
+ err = err | write_uint16_bigendian(world->player->pos.y + 1, file);
+ err = err | write_uint16_bigendian(world->player->pos.x + 1, file);
+ err = err | write_uint8(world->player->hitpoints, file);
+ err = err | write_map_objects(world, world->monster, file);
+ err = err | write_map_objects(world, world->item, file);
+ exit_err(err, world, "Error saving game.");
fclose(file);
}
@@ -234,12 +216,10 @@ extern struct yx_uint16 find_passable_pos(struct Map * map)
-extern 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)
+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)
{
if (key == get_action_key(world->keybindings, "quit"))
{