X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmisc.c;h=cfa43caf14b7054e682d631a20b85e328a1bfbd9;hb=6ba18516a602b3d4ad95981887ad9c5eb40a335a;hp=ec05accaa513ac3ba8389f6020f1c5bb96e61924;hpb=b9082c113c43afe5c6a11c2b72f845ee2f8c6aea;p=plomrogue
diff --git a/src/misc.c b/src/misc.c
index ec05acc..cfa43ca 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -3,6 +3,7 @@
#include "misc.h"
#include /* for calloc(), free() */
#include /* for strlen(), strcmp(), memcpy() */
+#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
@@ -132,16 +133,16 @@ extern void turn_over(struct World * world, char action)
extern void save_game(struct World * world)
{
- uint8_t fail;
+ uint8_t err;
FILE * file = fopen("savefile", "w");
- fail = write_uint32_bigendian(world->seed, file);
- fail = fail | write_uint32_bigendian(world->turn, file);
- fail = fail | write_uint16_bigendian(world->player->pos.y + 1, file);
- fail = fail | write_uint16_bigendian(world->player->pos.x + 1, file);
- fail = fail | write_uint8(world->player->hitpoints, file);
- fail = fail | write_map_objects(world, world->monster, file);
- fail = fail | write_map_objects(world, world->item, file);
- exit_err(fail, world, "Error saving game.");
+ 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);
}
@@ -215,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"))
{