Client: Save commands config file path in world struct.

[plomrogue] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index 61c53b8f7d1861ad28c8799c7bd3b6dc2d85d7e9..c7ac6f1a94a771f36577f899e68581bd0bd85124 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -2,6 +2,7 @@
 
 #include <ncurses.h> /* keypad() */
 #include <signal.h> /* struct sigaction, sigaction() */
+#include <stddef.h> /* NULL */
 #include <stdlib.h> /* exit() */
 #include <string.h> /* memset() */
 #include "../common/rexit.h" /* set_cleanup_func(), exit_trouble() */
@@ -9,6 +10,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 */
 
 
@@ -22,7 +24,8 @@ int main(int argc, char * argv[])
     char * f_name = "main()";
 
     /* Declare hard-coded paths here. */
-    world.path_server_in = "server/in";
+    world.path_server_in      = "server/in";
+    world.path_commands       = "confclient/commands";
     world.path_interface_conf = "confclient/interface_conf";
 
     /* Parse command line arguments. */
@@ -32,11 +35,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. */