Made game exiting and cleaning up more flexible. Provided so far unused exit-on-error...

[plomrogue] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index a8918a9ccdfdc76a1899226298823b4fbacbfd43..0bb50a76fa4c7831ccfece4f41bab471c30b46ae 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,39 +1,23 @@
 /* misc.c */
 
 #include "misc.h"
-#include <stdlib.h> /* for exit(), EXIT_SUCCESS define, calloc(), free() */
+#include <stdlib.h> /* for calloc(), free() */
 #include <string.h> /* for strlen(), strcmp(), memcpy() */
-#include <ncurses.h> /* for endwin() */
-#include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(), */
-                     /* resize_active_win(), cycle_active_win(),             */
-                     /* shift_active_win(), struct Win, struct WinMeta       */
-#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 "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(),
+                      * resize_active_win(), cycle_active_win(),
+                      * shift_active_win(), struct Win, struct WinMeta
+                      */
+#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 "map_object_actions.h" /* for is_passable(), move_monster() */
-#include "map.h" /* for map_scroll()/map_center_player(), Map struct, dir enum */
+#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 */
-
-
-
-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 "rrand.h" /* for rrand(), rrand_seed() */
 
 
 
@@ -71,22 +55,6 @@ extern void textfile_sizes(FILE * file, uint16_t * linemax_p,
 
 
 
-extern uint16_t rrand(char use_seed, uint32_t new_seed)
-{
-    static uint32_t seed;
-    if (0 != use_seed)
-    {
-        seed = new_seed;
-    }
-
-    /* Constants as recommended by POSIX.1-2001 (see man page rand(3)). */
-    seed = ((seed * 1103515245) + 12345) % 2147483648;
-
-    return (seed / 65536);    /* TODO: Use bit-shifting for ignoring the less */
-}                             /* random least significant 16 bits.            */
-
-
-
 extern void update_log(struct World * world, char * text)
 {
     static char * last_msg;
@@ -151,7 +119,7 @@ extern void turn_over(struct World * world, char action)
         fclose(file);
     }
     world->turn++;
-    rrand(1, world->seed * world->turn);
+    rrand_seed(world->seed * world->turn);
     struct Monster * monster;
     for (monster = world->monster;
          monster != 0;
@@ -171,8 +139,8 @@ extern void save_game(struct World * world)
     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);
+    write_map_objects(world, world->monster, file);
+    write_map_objects(world, world->item, file);
     fclose(file);
 }
 
@@ -238,8 +206,8 @@ extern struct yx_uint16 find_passable_pos(struct Map * map)
     struct yx_uint16 pos;
     for (pos.y = pos.x = 0; 0 == is_passable(map, pos);)
     {
-        pos.y = rrand(0, 0) % map->size.y;
-        pos.x = rrand(0, 0) % map->size.x;
+        pos.y = rrand() % map->size.y;
+        pos.x = rrand() % map->size.x;
     }
     return pos;
 }