Player earns a score by killing enemies.

[plomrogue] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index 6f8c6c766ac1b0807b64e73a8524e4c8fb3c1f19..8eda126ccdfcf2621ec950c3b99f5a857980ac70 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -114,16 +114,16 @@ extern uint16_t center_offset(uint16_t pos, uint16_t mapsize,
 
 extern void turn_over(struct World * world, char action)
 {
-    char * err_open  = "Error recording move: "
-                       "Unable to open file 'record_tmp' for appending.";
-    char * err_write = "Error recording move: "
-                       "Trouble writing to opened file 'record_tmp'.";
-    char * err_close = "Error recording move: "
-                       "Unable to close opened file 'record_tmp'.";
-    char * err_unl   = "Error recording move: "
-                       "Unable to unlink old file 'record'.";
-    char * err_move  = "Error recording move: "
-                        "Unable to rename file 'record_tmp' to 'record'.";
+    char * err_open  = "Trouble in turn_over() with fopen() "
+                       "opening file 'record_tmp' for appending.";
+    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'.";
+    char * err_unl   = "Trouble in turn_over() with unlink() "
+                       "unlinking old file 'record'.";
+    char * err_move  = "Trouble in turn_over() with rename() "
+                       "renaming file 'record_tmp' to 'record'.";
     char * recordfile_tmp = "record_tmp";
     char * recordfile     = "record";
     if (1 == world->interactive)
@@ -151,22 +151,23 @@ extern void turn_over(struct World * world, char action)
 
 extern void save_game(struct World * world)
 {
-    char * err_open  = "Error saving game: "
-                       "Unable to open file 'savefile_tmp' for writing.";
-    char * err_write = "Error saving game: "
-                       "Trouble writing to opened file 'savefile_tmp'.";
-    char * err_close = "Error saving game: "
-                       "Unable to close opened file 'savefile_tmp'.";
-    char * err_unl   = "Error saving game: "
-                       "Unable to unlink old 'savefile' file.";
-    char * err_move  = "Error saving game: "
-                        "Unable to rename 'file savefile_tmp' to 'savefile'.";
+    char * err_open  = "Trouble in save_game() with fopen() "
+                       "opening file 'savefile_tmp' for writing.";
+    char * err_write = "Trouble in save_game() "
+                       "writing to opened file 'savefile_tmp'.";
+    char * err_close = "Trouble in save_game() with fclose() "
+                       "closing opened file 'savefile_tmp'.";
+    char * err_unl   = "Trouble in save_game() with unlink() "
+                       "unlinking old 'savefile' file.";
+    char * err_move  = "Trouble in save_game() with rename() "
+                       "renaming 'file savefile_tmp' to 'savefile'.";
     char * savefile_tmp = "savefile_tmp";
     char * savefile     = "savefile";
     FILE * file = fopen(savefile_tmp, "w");
     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)
@@ -185,15 +186,15 @@ extern void save_game(struct World * world)
 
 
 
-extern void toggle_window(struct WinMeta * win_meta, struct Win * win)
+extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win)
 {
     if (0 != win->frame.curses_win)
     {
-        suspend_win(win_meta, win);
+        return suspend_win(win_meta, win);
     }
     else
     {
-        append_win(win_meta, win);
+        return append_win(win_meta, win);
     }
 }
 
@@ -213,7 +214,7 @@ extern void scroll_pad(struct WinMeta * win_meta, char dir)
 
 
 
-extern void growshrink_active_window(struct WinMeta * win_meta, char change)
+extern uint8_t growshrink_active_window(struct WinMeta * win_meta, char change)
 {
     if (0 != win_meta->active)
     {
@@ -234,8 +235,9 @@ extern void growshrink_active_window(struct WinMeta * win_meta, char change)
         {
             size.x++;
         }
-        resize_active_win (win_meta, size);
+        return resize_active_win (win_meta, size);
     }
+    return 0;
 }
 
 
@@ -258,6 +260,10 @@ extern uint8_t meta_keys(int key, struct World * world,
                          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;
@@ -272,51 +278,51 @@ extern uint8_t meta_keys(int key, struct World * world,
     }
     else if (key == get_action_key(world->keybindings, "toggle keys window"))
     {
-        toggle_window(win_meta, win_keys);
+        exit_err(toggle_window(win_meta, win_keys), world, err_toggle);
     }
     else if (key == get_action_key(world->keybindings, "toggle map window"))
     {
-        toggle_window(win_meta, win_map);
+        exit_err(toggle_window(win_meta, win_map), world, err_toggle);
     }
     else if (key == get_action_key(world->keybindings, "toggle info window"))
     {
-        toggle_window(win_meta, win_info);
+        exit_err(toggle_window(win_meta, win_info), world, err_toggle);
     }
     else if (key == get_action_key(world->keybindings, "toggle log window"))
     {
-        toggle_window(win_meta, win_log);
+        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, 'n');
+        cycle_active_win(win_meta, 'f');
     }
     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"))
     {
-        shift_active_win(win_meta, 'f');
+        exit_err(shift_active_win(win_meta, 'f'), world, err_shift);
     }
     else if (key == get_action_key(world->keybindings, "shift backwards"))
     {
-        shift_active_win(win_meta, 'b');
+        exit_err(shift_active_win(win_meta, 'b'), world, err_shift);
     }
     else if (key == get_action_key(world->keybindings, "grow horizontally"))
     {
-        growshrink_active_window(win_meta, '*');
+        exit_err(growshrink_active_window(win_meta, '*'), world, err_resize);
     }
     else if (key == get_action_key(world->keybindings, "shrink horizontally"))
     {
-        growshrink_active_window(win_meta, '_');
+        exit_err(growshrink_active_window(win_meta, '_'), world, err_resize);
     }
     else if (key == get_action_key(world->keybindings, "grow vertically"))
     {
-        growshrink_active_window(win_meta, '+');
+        exit_err(growshrink_active_window(win_meta, '+'), world, err_resize);
     }
     else if (key == get_action_key(world->keybindings, "shrink vertically"))
     {
-        growshrink_active_window(win_meta, '-');
+        exit_err(growshrink_active_window(win_meta, '-'), world, err_resize);
     }
     else if (key == get_action_key(world->keybindings, "save keys"))
     {