Merged Win and WinConf structs, windows.h and wincontrol.h. Also lots of refactoring...

[plomrogue] / src / client / keybindings.c

diff --git a/src/client/keybindings.c b/src/client/keybindings.c
index 7207641d457b585a62e07a2c62db5d155dd68c45..fd62dda809b9e4ac40fe55474f5ddd5687554867 100644 (file)
--- a/src/client/keybindings.c
+++ b/src/client/keybindings.c
@@ -9,7 +9,6 @@
 #include <string.h> /* strlen(), strchr(), strcmp() */
 #include "../common/readwrite.h" /* textfile_sizes(), try_fgets(),try_fwrite()*/
 #include "../common/try_malloc.h" /* try_malloc() */
-#include "wincontrol.h" /* get_winconf_by_win() */
 #include "windows.h" /* draw_all_wins() */
 #include "world.h" /* global world */
 
@@ -82,8 +81,8 @@ static struct KeyBindingDB * char_selected_kb_db(char c)
     }
     else if ('w' == c)
     {
-        struct WinConf * wc = get_winconf_by_win(world.wins.win_active);
-        kbd = &wc->kb;
+        struct Win * w = get_win_by_id(world.windb.active);
+        kbd = &w->kb;
     }
     return kbd;
 }