X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=c7ac6f1a94a771f36577f899e68581bd0bd85124;hb=37fb9ef76174a83e27dd27a3250f4be5542e7452;hp=473228c70840eb2af513dc51713539f690326d07;hpb=e8e8f91cff96eebc1b440df18d9c3ef4ced1ca60;p=plomrogue

diff --git a/src/client/main.c b/src/client/main.c
index 473228c..c7ac6f1 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,14 +1,16 @@
 /* main.c */
 
+#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() */
-#include "cleanup.h" /* cleanup() */
+#include "cleanup.h" /* cleanup(), set_cleanup_flag() */
 #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" /* init_wmeta_and_ncurses(); */
+#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,8 +35,11 @@ int main(int argc, char * argv[])
     set_cleanup_func(cleanup);
 
     /* Initialize the whole interface. */
-    init_wmeta_and_ncurses();
-    keypad(world.wmeta.screen, TRUE);
+    world.winDB.t_screen = initscr();
+    set_cleanup_flag(CLEANUP_NCURSES);
+    noecho();
+    curs_set(0);
+    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. */