X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fcontrol.c;h=874601b90d32092e946e97c95ffc6911c38b2ccf;hb=aafa0cb49e7ec8600dad902411de6e76e111c939;hp=8455aaf041272167dbcbaeeb0ab949f2023bda0d;hpb=e49cd07e79574ba404a0a8fc867344cc630d7794;p=plomrogue
diff --git a/src/control.c b/src/control.c
index 8455aaf..874601b 100644
--- a/src/control.c
+++ b/src/control.c
@@ -8,7 +8,7 @@
#include "keybindings.h" /* for get_keycode_to_action(), mod_selected_keyb(),
* move_keyb_mod_selection()
*/
-#include "map.h" /* for map_scroll(), map_center_player(), dir enum */
+#include "map.h" /* for map_scroll(), map_center_object() */
#include "main.h" /* for World struct */
#include "rexit.h" /* for exit_err() */
#include "wincontrol.h" /* for scroll_pad(), toggle_window(),
@@ -20,6 +20,8 @@
#include "misc.h" /* for load_interface_conf(), unload_interface_conf(),
* save_interface_conf()
*/
+#include "yx_uint16.h" /* for dir enum */
+#include "map_objects.h" /* for get_player() */
@@ -179,10 +181,7 @@ extern uint8_t winkeyb_control(int key, struct World * world)
extern uint8_t meta_control(int key, struct World * world)
{
struct WinMeta * win_meta = world->wmeta;
- struct Win * win_keys = get_win_by_id(world, '0'); /* Bad hardcoding. */
- struct Win * win_map = get_win_by_id(world, 'm'); /* TODO: Replace. */
- struct Win * win_info = get_win_by_id(world, 'i'); /* */
- struct Win * win_log = get_win_by_id(world, 'l'); /* */
+ struct Win * win_map = get_win_by_id(world, 'm');
char * err_toggle = "Trouble with toggle_window() in meta_control().";
if (key == get_available_keycode_to_action(world, "quit"))
{
@@ -215,7 +214,8 @@ extern uint8_t meta_control(int key, struct World * world)
}
else if (key == get_available_keycode_to_action(world, "to_g_keywin"))
{
- exit_err(toggle_window(win_meta, win_keys), world, err_toggle);
+ uint8_t test = toggle_window(win_meta, get_win_by_id(world, '0'));
+ exit_err(test, world, err_toggle);
}
else if (key == get_available_keycode_to_action(world, "to_wg_keywin"))
{
@@ -233,7 +233,8 @@ extern uint8_t meta_control(int key, struct World * world)
}
else if (key == get_available_keycode_to_action(world, "to_infowin"))
{
- exit_err(toggle_window(win_meta, win_info), world, err_toggle);
+ uint8_t test = toggle_window(win_meta, get_win_by_id(world, 'i'));
+ exit_err(test, world, err_toggle);
}
else if (key == get_available_keycode_to_action(world, "to_inv"))
{
@@ -242,7 +243,8 @@ extern uint8_t meta_control(int key, struct World * world)
}
else if (key == get_available_keycode_to_action(world, "to_logwin"))
{
- exit_err(toggle_window(win_meta, win_log), world, err_toggle);
+ uint8_t test = toggle_window(win_meta, get_win_by_id(world, 'l'));
+ exit_err(test, world, err_toggle);
}
else if (key == get_available_keycode_to_action(world, "save_conf"))
{
@@ -302,7 +304,7 @@ extern uint8_t meta_control(int key, struct World * world)
}
else if (key == get_available_keycode_to_action(world, "map_c"))
{
- map_center_player(world->map, world->player, win_map->frame.size);
+ map_center_object(world->map, get_player(world), win_map->frame.size);
}
else if (key == get_available_keycode_to_action(world, "reload_conf"))
{