Merged Win and WinConf structs, windows.h and wincontrol.h. Also lots of refactoring...

[plomrogue] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index 61c53b8f7d1861ad28c8799c7bd3b6dc2d85d7e9..3e3bbdd28f7c6b6a83a2ac801d26caa2967eac92 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -9,6 +9,7 @@
 #include "command_db.h" /* init_command_db() */
 #include "io.h" /* io_loop(), try_send() */
 #include "misc.h" /* load_interface_conf(), winch_called() */
+#include "windows.h" /* struct Win, winch_called() */
 #include "world.h" /* struct World */
 
 
@@ -32,11 +33,11 @@ int main(int argc, char * argv[])
     set_cleanup_func(cleanup);
 
     /* Initialize the whole interface. */
-    world.wins.screen = initscr();
+    world.windb.t_screen = initscr();
     set_cleanup_flag(CLEANUP_NCURSES);
     noecho();
     curs_set(0);
-    keypad(world.wins.screen, TRUE);
+    keypad(world.windb.t_screen, TRUE);
     init_command_db();      /* The command DB needs to be initialized before  */
     load_interface_conf();  /* the interface, whose keybindings depend on it. */