X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=acb592bff8482c9215c1b3a29593b22c7da5fe0a;hb=258e57c1621533e206610453047d829cc8aa13fe;hp=344df6911aa9d19536c5bfdae8c4876df73b0d13;hpb=778534bf6946fe0fef17e353c55678d248d8d09d;p=plomrogue

diff --git a/src/client/main.c b/src/client/main.c
index 344df69..acb592b 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,8 +1,13 @@
-/* main.c */
+/* main.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
 
 #define _POSIX_C_SOURCE 1 /* sigaction, sigaction() */
 #define _DARWIN_C_SOURCE 1 /* SIGWINCH on OS X */
-#include <ncurses.h> /* keypad() */
+#include <ncurses.h> /* keypad(), start_color() */
 #include <signal.h> /* SIGWINCH, sigaction, sigaction() */
 #include <stddef.h> /* NULL */
 #include <stdlib.h> /* exit() */
@@ -25,12 +30,10 @@ struct World world;
 
 int main(int argc, char * argv[])
 {
-    char * f_name = "main()";
-
     /* Declare hard-coded paths and values here. */
     world.path_commands    = "confclient/commands";
     world.path_interface   = "confclient/interface_conf";
-    world.winDB.legal_ids  = "012ciklm";
+    world.winDB.legal_ids  = "012cilms";
     char * path_server_in  = "server/in";
     char * path_server_out = "server/out";
 
@@ -46,25 +49,26 @@ int main(int argc, char * argv[])
 
     /* Initialize the whole interface. */
     world.winDB.t_screen = initscr();
+    start_color();
     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. */
-    world.focus_each_turn = 1;
+    world.autofocus = 1;
 
     /* Set handler for terminal window resizing. */
     struct sigaction act;
     memset(&act, 0, sizeof(act));
     act.sa_handler = &winch_called;
-    exit_trouble(sigaction(SIGWINCH, &act, NULL), f_name, "sigaction()");
+    exit_trouble(sigaction(SIGWINCH, &act, NULL), __func__, "sigaction");
 
     /* Open file streams for communicating with the server. */
     exit_err(access(path_server_in, F_OK), "No server input file found.");
-    world.file_server_in = try_fopen(path_server_in, "a", f_name);
+    world.file_server_in = try_fopen(path_server_in, "a", __func__);
     set_cleanup_flag(CLEANUP_SERVER_IN);
-    world.file_server_out = try_fopen(path_server_out, "r", f_name);
+    world.file_server_out = try_fopen(path_server_out, "r", __func__);
     set_cleanup_flag(CLEANUP_SERVER_OUT);
 
     /* This is where most everything happens. */
@@ -72,6 +76,6 @@ int main(int argc, char * argv[])
 
     /* Leave properly. */
     cleanup();
-    exit_trouble(printf("%s\n", quit_msg) < 0, f_name, "printf()");
+    exit_trouble(printf("%s\n", quit_msg) < 0, __func__, "printf");
     exit(EXIT_SUCCESS);
 }