Minor refactoring of meta_control().

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index 0cdcaf16293db6472075f472c6ac09aacf29b1a9..8d00a5df769bf6c76b3e6b8dba7ead74371143d7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -7,15 +7,10 @@
 #include <time.h> /* for time() */
 #include <unistd.h> /* for getopt(), optarg */
 #include <stdint.h> /* for uint16_t, uint32_t */
-#include "windows.h" /* for structs WinMeta, Win, init_win(), init_win_meta(),
-                      * draw_all_wins()
+#include "windows.h" /* for structs WinMeta, Win, init_win_meta(), draw_all_wins()
                       */
-#include "draw_wins.h" /* for draw_keys_win(), draw_map_win(), draw_info_win(),
-                        * draw_log_win()
-                        */
-#include "keybindings.h" /* for init_keybindings(), get_action_key() */
 #include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian](),
-                        * try_fopen(), try_fclose(), try_fclose_unlink_renmae()
+                        * try_fopen(), try_fclose(), try_fclose_unlink_rename()
                         */
 #include "map_objects.h" /* for structs Monster, Item, Player,
                           * init_map_object_defs(), read_map_objects(),
@@ -23,15 +18,14 @@
                           */
 #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()
+                   * try_calloc(), check_tempfile(), check_xor_files(),
+                   * load_interface_conf()
                    */
-#include "wincontrol.h" /* for create_winconfs(), init_winconfs(), init_wins(),
-                         * sorted_wintoggle()
-                         */
+#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 "control.h" /* for meta_control() */
 #include "command_db.h" /* for init_command_db() */
+#include "control.h" /* for *_control(), get_available_keycode_to_action() */
 
 
 
@@ -95,6 +89,7 @@ int main(int argc, char *argv[])
     world.item = 0;
     init_map_object_defs(&world, "config/defs");
     set_cleanup_flag(CLEANUP_MAP_OBJECT_DEFS);
+    world.map_object_count = 1;
 
     /* For interactive mode, try to load world state from savefile. */
     char * err_r = "Trouble loading game (in main()) / "
@@ -123,8 +118,8 @@ int main(int argc, char *argv[])
     /* For non-interactive mode, try to load world state from record file. */
     else
     {
-        err_r = "Trouble reading from 'record' file (read_uint32_bigendian() in "
-                "main()).";
+        err_r = "Trouble reading from 'record' file (read_uint32_bigendian() "
+                "in main()).";
         if (0 == world.interactive)
         {
             file = try_fopen(recordfile, "r", &world, f_name);
@@ -175,20 +170,20 @@ int main(int argc, char *argv[])
     curs_set(0);
     keypad(screen, TRUE);
     raw();
-    init_keybindings(&world);
-    set_cleanup_flag(CLEANUP_KEYBINDINGS);
     char * err_winmem = "Trouble with init_win_meta() in main ().";
     exit_err(init_win_meta(screen, &world.wmeta), &world, err_winmem);
     set_cleanup_flag(CLEANUP_WIN_META);
-    init_winconfs(&world);
-    set_cleanup_flag(CLEANUP_WINCONFS);
-    init_wins(&world);
-    set_cleanup_flag(CLEANUP_WINS);
-    sorted_wintoggle(&world);
+    load_interface_conf(&world);
+    set_cleanup_flag(CLEANUP_INTERFACE_CONF);
     err_winmem = "Trouble with draw_all_wins() in main().";
 
+    /* Focus map on player. */
+    struct Win * win_map = get_win_by_id(&world, 'm');
+    map_center_player(&map, &player, win_map->frame.size);
+
     /* Replay mode. */
     int key;
+    struct WinConf * wc;
     if (0 == world.interactive)
     {
         int action = 0;
@@ -208,8 +203,14 @@ int main(int argc, char *argv[])
         {
             draw_all_wins(world.wmeta);
             key = getch();
+            wc = get_winconf_by_win(&world, world.wmeta->active);
+            if  (   (1 == wc->view && wingeom_control(key, &world))
+                 || (2 == wc->view && winkeyb_control(key, &world)))
+            {
+                continue;
+            }
             if (   EOF != action
-                && key == get_action_key(world.keybindings, "wait"))
+                && key == get_available_keycode_to_action(&world, "wait"))
             {
                 action = getc(file);
                 if (EOF != action)
@@ -233,10 +234,23 @@ int main(int argc, char *argv[])
             save_game(&world);
             draw_all_wins(world.wmeta);
             key = getch();
-            if (0 != player.hitpoints && 0 == player_control(key, &world))
+            wc = get_winconf_by_win(&world, world.wmeta->active);
+            if      (1 == wc->view && wingeom_control(key, &world))
             {
                 continue;
             }
+            else if (2 == wc->view && winkeyb_control(key, &world))
+            {
+                continue;
+            }
+
+            if  (   (1 == wc->view && wingeom_control(key, &world))
+                 || (2 == wc->view && winkeyb_control(key, &world))
+                 || (0 != player.hitpoints && player_control(key, &world)))
+            {
+                continue;
+            }
+
             if (meta_control(key, &world))
             {
                 exit_game(&world);