X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fmain.c;h=c92d604c7ba3404982c614137155a155133c9864;hb=fcf58a650b9c0a9c3aa08c2c25ea14d70e08f8c7;hp=7caef902be0f9dad534f8d1c758f5af149d28a37;hpb=f21d01eb14c3b3ac09463de3e573dd99e002fe3d;p=plomrogue

diff --git a/src/main.c b/src/main.c
index 7caef90..c92d604 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,6 +28,8 @@
 #include "yx_uint16.h" /* for dir enum */
 #include "rrand.h" /* for rrand(), rrand_seed() */
 #include "rexit.h" /* for exit_game() */
+#include "control.h" /* for meta_keys() */
+
 
 int main(int argc, char *argv[])
 {
@@ -106,6 +108,7 @@ int main(int argc, char *argv[])
         exit_err(0 == file, &world, err_o);
         if (   read_uint32_bigendian(file, &world.seed)
             || read_uint32_bigendian(file, &world.turn)
+            || read_uint16_bigendian(file, &world.score)
             || read_uint16_bigendian(file, &player.pos.y)
             || read_uint16_bigendian(file, &player.pos.x)
             || read_uint8(file, &player.hitpoints)
@@ -130,7 +133,7 @@ int main(int argc, char *argv[])
         if (0 == world.interactive)
         {
             file = fopen(recordfile, "r");
-            exit_err(0 == file, &world, err_o);
+            exit_err(NULL == file, &world, err_o);
             exit_err(read_uint32_bigendian(file, &world.seed), &world, err_r);
         }
 
@@ -140,6 +143,7 @@ int main(int argc, char *argv[])
         else
         {
             world.seed = time(NULL);
+            world.score = 0;
 
             err_o        = "Trouble recording new seed (fopen() in main()) / "
                            "opening 'record_tmp' file for writing.";
@@ -187,24 +191,30 @@ int main(int argc, char *argv[])
     init_keybindings(&world);
     set_cleanup_flag(CLEANUP_KEYBINDINGS);
     struct WinMeta win_meta;
-    char * err_winmem = "Trouble with init_win() or draw_all_wins() in main().";
+    char * err_winmem = "Trouble with init_win:meta() or draw_all_wins() in "
+                        "main().";
     exit_err(init_win_meta(screen, &win_meta), &world, err_winmem);
+    world.wins.meta = &win_meta;
     struct Win win_keys = init_win(&win_meta, "Keys",
-                                   0, 29, &world, draw_keys_win);
+                                     0, 29, &world, draw_keys_win);
+    world.wins.keys = &win_keys;
     struct Win win_info = init_win(&win_meta, "Info",
-                                   2, 20, &world, draw_info_win);
+                                   3, 20, &world, draw_info_win);
+    world.wins.info = &win_info;
     uint16_t height_logwin = win_meta.padframe.size.y
                              - (2 + win_info.frame.size.y);
     struct Win win_log = init_win(&win_meta, "Log",
                                   height_logwin, 20, &world, draw_log_win);
+    world.wins.log = &win_log;
     uint16_t width_mapwin = win_meta.padframe.size.x - win_keys.frame.size.x
-                             - win_log.frame.size.x - 2;
+                            - win_log.frame.size.x - 2;
     struct Win win_map = init_win(&win_meta, "Map",
                                   0, width_mapwin, &world, draw_map_win);
-    toggle_window(&win_meta, &win_keys);
-    toggle_window(&win_meta, &win_map);
-    toggle_window(&win_meta, &win_info);
-    toggle_window(&win_meta, &win_log);
+    world.wins.map = &win_map;
+    toggle_window(&win_meta, world.wins.keys);
+    toggle_window(&win_meta, world.wins.map);
+    toggle_window(&win_meta, world.wins.info);
+    toggle_window(&win_meta, world.wins.log);
 
     /* Replay mode. */
     int key;
@@ -258,8 +268,7 @@ int main(int argc, char *argv[])
             }
             else
             {
-                quit_called = meta_keys(key, &world, &win_meta, &win_keys,
-                                             &win_map, &win_info, &win_log);
+                quit_called = meta_keys(key, &world);
                 if (1 == quit_called)
                 {
                     err_c = "Trouble closing 'record' file (fclose() in "
@@ -320,8 +329,7 @@ int main(int argc, char *argv[])
             }
             else
             {
-                quit_called = meta_keys(key, &world, &win_meta, &win_keys,
-                                             &win_map, &win_info, &win_log);
+                quit_called = meta_keys(key, &world);
                 if (1 == quit_called)
                 {
                     exit_game(&world);