Some code-stylistic improvements to rexit library; also moved exit_trouble() into it.

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index 88d90d2844dc1e51b48205101933a1791b974bc4..9bb983dcb5ff212d5e1aae9478cc2265b1c30b85 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -20,15 +20,15 @@
 #include "map.h" /* for struct Map, init_map() */
 #include "misc.h" /* for update_log(), find_passable_pos(), save_game(),
                    * try_calloc(), check_tempfile(), check_xor_files(),
-                   * load_interface_conf(), load_game()
+                   * load_interface_conf(), load_game(), rrand()
                    */
 #include "wincontrol.h" /* get_win_by_id(), get_winconf_by_win() */
-#include "rrand.h" /* for rrand(), rrand_seed() */
 #include "rexit.h" /* for exit_game(), exit_err() */
 #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()
                       */
+#include "map_object_actions.h" /* for init_map_object_actions() */
 
 
 
@@ -37,8 +37,11 @@ int main(int argc, char *argv[])
     char * f_name = "main()";
     world.turn = 0;        /* Turns to 1 when map and objects are initalized. */
 
+    /* Initialize commands and map object actions. */
     init_command_db();
     set_cleanup_flag(CLEANUP_COMMAND_DB);
+    init_map_object_actions();
+    set_cleanup_flag(CLEANUP_MAP_OBJECT_ACTS);
 
     /* Check for corrupted savefile / recordfile savings. */
     char * recordfile = "record";
@@ -123,12 +126,14 @@ int main(int argc, char *argv[])
             exit_err(write_uint32_bigendian(world.seed, file), err_w);
             try_fclose_unlink_rename(file, recordfile_tmp, recordfile, f_name);
         }
+        world.mapseed = world.seed;
     }
 
     /* Generate map from seed and, if newly generated world, start positions of
      * actors.
      */
-    rrand_seed(world.seed);
+    uint32_t restore_seed = world.seed;
+    world.seed = world.mapseed;
     struct Map map = init_map();
     world.map = ↦
     set_cleanup_flag(CLEANUP_MAP);
@@ -144,18 +149,17 @@ int main(int argc, char *argv[])
         set_cleanup_flag(CLEANUP_MAP_OBJECTS);
         world.turn = 1;
     }
+    world.seed = restore_seed;
 
     /* Initialize window system and windows. */
-    WINDOW * screen = initscr();
+    init_win_meta();
     set_cleanup_flag(CLEANUP_NCURSES);
     noecho();
     curs_set(0);
-    keypad(screen, TRUE);
+    keypad(world.wmeta->screen, TRUE);
     raw();
-    init_win_meta(screen);
-    set_cleanup_flag(CLEANUP_WIN_META);
     load_interface_conf();
-    set_cleanup_flag(CLEANUP_INTERFACE_CONF);
+    set_cleanup_flag(CLEANUP_INTERFACE);
 
     /* Focus map on player. */
     struct MapObj * player = get_player();