X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fwindows.c;h=fa626848aacfe5f3b0ff9e5abc8d41e3173176b4;hb=8bf4e35ebe159f9cf051c8dbfc0909d7fe5d3399;hp=3881393ac01babe807f69e74576cf9c46f49d01f;hpb=1cb57a35a3b3cc4ec8870531ca254a655c0bdda2;p=plomrogue diff --git a/src/client/windows.c b/src/client/windows.c index 3881393..fa62684 100644 --- a/src/client/windows.c +++ b/src/client/windows.c @@ -1,4 +1,9 @@ -/* src/client/windows.c */ +/* src/client/windows.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 200809L /* strnlen() */ #include "windows.h" @@ -16,10 +21,10 @@ #include "../common/try_malloc.h" /* try_malloc() */ #include "draw_wins.h" /* draw_winconf_geometry(), draw_winconf_keybindings(), * draw_win_inventory(), draw_win_info(), draw_win_log(), - * draw_win_available_keybindings(), draw_win_map(), * draw_win_keybindings_winconf_keybindings(), * draw_win_keybindings_winconf_geometry(), - * draw_win_keybindings_global() + * draw_win_keybindings_global(), draw_win_map(), + * draw_win_terrain_stack() */ #include "wincontrol.h" /* toggle_window() */ #include "world.h" /* world */ @@ -114,9 +119,9 @@ static void (* get_drawfunc_by_char(char c)) () { void (* f) (struct Win *) = NULL; if ( match_func(c, &f, 'c', draw_win_inventory) + || match_func(c, &f, 's', draw_win_terrain_stack) || match_func(c, &f, 'i', draw_win_info) || match_func(c, &f, 'l', draw_win_log) - || match_func(c, &f, 'k', draw_win_available_keybindings) || match_func(c, &f, 'm', draw_win_map) || match_func(c, &f, '0', draw_win_keybindings_global) || match_func(c, &f, '1', draw_win_keybindings_winconf_geometry) @@ -304,7 +309,7 @@ static void draw_wins(struct Win * w) { chtype ch = w->winmap[(y * w->winmap_size.x) + x]; mvwaddch(world.winDB.v_screen, w->start.y + (y - offset_y), - w->start.x + (x - offset_x), ch); + w->start.x + (x - offset_x), ch); } } free(w->winmap); /* NULL so draw_wins.c's try_resize_winmap() may always */ @@ -400,7 +405,7 @@ extern void make_v_screen_and_init_win_sizes() world.winDB.v_screen_size.y = maxy_test; world.winDB.v_screen_size.x = maxx_test; world.winDB.v_screen = newpad(world.winDB.v_screen_size.y, 1); - exit_trouble(NULL == world.winDB.v_screen, __func__, err_m); + exit_trouble(!world.winDB.v_screen, __func__, err_m); char id; while (0 != (id = get_next_win_id())) {