X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fcontrol.c;h=0c782ab158a7b15ad81aa6241ff563039fa7a9a2;hb=3b2c82991c9ab169b33248c7be840a9bcd351e6d;hp=9915891bd756337b7c954ca3c3282b004d7fb451;hpb=58f0067336c9239750009b3f35d18031bec8f7b5;p=plomrogue
diff --git a/src/control.c b/src/control.c
index 9915891..0c782ab 100644
--- a/src/control.c
+++ b/src/control.c
@@ -11,32 +11,33 @@
#include "map.h" /* for map_scroll(), map_center_player(), dir enum */
#include "main.h" /* for World struct */
#include "rexit.h" /* for exit_err() */
-#include "misc.h" /* for scroll_pad(), toggle_window(),
- * growshrink_active_window()
- */
+#include "wincontrol.h" /* for scroll_pad(), toggle_window(),
+ * growshrink_active_window()
+ */
#include "map_object_actions.h" /* for player_wait(), move_player() */
+#include "command_db.h" /* for is_command_id_shortdsc() */
extern void record_control(int action, struct World * world)
{
- if (0 == action)
+ if (is_command_id_shortdsc(world, action, "wait"))
{
player_wait(world);
}
- else if (NORTH == action)
+ else if (is_command_id_shortdsc(world, action, "player_u"))
{
move_player(world, NORTH);
}
- else if (EAST == action)
+ else if (is_command_id_shortdsc(world, action, "player_r"))
{
move_player(world, EAST);
}
- else if (SOUTH == action)
+ else if (is_command_id_shortdsc(world, action, "player_d"))
{
move_player(world, SOUTH);
}
- else if (WEST == action)
+ else if (is_command_id_shortdsc(world, action, "player_l"))
{
move_player(world, WEST);
}