X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=9c6a72ac3f19a3c8942d2c89a68955b703935ee7;hb=04ae91b82c603f0928d94a94df3a322a7af8b971;hp=1821e57f9205007d596f286e794cb0eba1896892;hpb=ef04cd096599eba243b40c5d40da38398adc7785;p=plomrogue diff --git a/src/client/main.c b/src/client/main.c index 1821e57..9c6a72a 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -25,8 +25,6 @@ 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"; @@ -52,18 +50,19 @@ int main(int argc, char * argv[]) 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; /* 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. */ @@ -71,6 +70,6 @@ int main(int argc, char * argv[]) /* Leave properly. */ cleanup(); - printf("%s\n", quit_msg); + exit_trouble(printf("%s\n", quit_msg) < 0, __func__, "printf"); exit(EXIT_SUCCESS); }