X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fwincontrol.c;h=3d0307817397343b8a42fb008e4a9da29b98466e;hb=8e38bb5605a46afd6398b69c63c935aa5dc83660;hp=6682087862af0e1e010b2d1c7fdabfb7e1f95c80;hpb=967562b96d9903fc73ee04716dbeb639e18db823;p=plomrogue
diff --git a/src/wincontrol.c b/src/wincontrol.c
index 6682087..3d03078 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -18,7 +18,7 @@
#include "main.h" /* for World struct */
#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_og(),
* draw_win_available_keybindings(),
- * draw_win_keybindings_global(),
+ * draw_win_keybindings_global(), draw_win_inventory(),
* draw_win_keybindings_winconf_geometry(),
* draw_win_keybindings_winconf_keybindings(),
* draw_winconf_geometry(), draw_winconf_keybindings()
@@ -208,12 +208,12 @@ static void save_win_config(struct World * world, char id)
}
linemax = linemax + 6; /* + 6 = + 3 digits + whitespace + \n + \0 */
- char keyb_line[linemax];
+ char kb_line[linemax];
kb_p = wc->kb.kbs;
while (0 != kb_p)
{
- snprintf(keyb_line, linemax, "%d %s\n", kb_p->key, kb_p->name);
- try_fwrite(keyb_line, sizeof(char), strlen(keyb_line), file, world, f_name);
+ snprintf(kb_line, linemax, "%d %s\n", kb_p->key, kb_p->name);
+ try_fwrite(kb_line, sizeof(char), strlen(kb_line), file, world, f_name);
kb_p = kb_p->next;
}
@@ -276,6 +276,10 @@ static struct WinConf * get_winconf_by_id(struct World * world, char id)
static void * get_drawfunc_by_char(char c)
{
+ if ('c' == c)
+ {
+ return draw_win_inventory;
+ }
if ('i' == c)
{
return draw_win_info;
@@ -284,14 +288,14 @@ static void * get_drawfunc_by_char(char c)
{
return draw_win_log;
}
- else if ('m' == c)
- {
- return draw_win_map;
- }
else if ('k' == c)
{
return draw_win_available_keybindings;
}
+ else if ('m' == c)
+ {
+ return draw_win_map;
+ }
else if ('0' == c)
{
return draw_win_keybindings_global;
@@ -461,20 +465,6 @@ extern void sorted_wintoggle_and_activate(struct World * world)
-extern void reload_win_config(struct World * world)
-{
- while (0 != world->wmeta->active)
- {
- suspend_win(world->wmeta, world->wmeta->active);
- }
- free_winconfs(world);
- init_winconfs(world);
- init_wins(world);
- sorted_wintoggle_and_activate(world);
-}
-
-
-
extern void save_win_configs(struct World * world)
{
char * f_name = "save_win_configs()";