X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fcontrol.c;h=1961334c0015064f103b825f64aaf89651652000;hb=169b8dda5f4c4373300b5be5edc113a376799737;hp=ed44d120c63c24aa63768cd5cd727ccd6e03ed94;hpb=be8c57c7e1de5962913f849b862faae01bead264;p=plomrogue
diff --git a/src/client/control.c b/src/client/control.c
index ed44d12..1961334 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -10,7 +10,6 @@
* mod_selected_keyb(), move_keyb_selection()
*/
#include "map.h" /* for map_scroll(), map_center() */
-#include "misc.h" /* nav_inventory() */
#include "wincontrol.h" /* shift_active_win(), resize_active_win(),
* toggle_win_size_type(), toggle_window(),
* cycle_active_win(), scroll_v_screen(),
@@ -21,6 +20,9 @@
+/* Move world.inventory_sel up ("dir"="u") or down (else) as far as possible. */
+static void nav_inventory(char dir);
+
/* If "command"'s .dsc_short fits "match", apply "f" with provided char
* arguments and return 1; else, return 0.
*/
@@ -43,6 +45,26 @@ static uint8_t try_server_commands(struct Command * command);
+static void nav_inventory(char dir)
+{
+ if ('u' == dir)
+ {
+ world.player_inventory_select = world.player_inventory_select
+ - (world.player_inventory_select > 0);
+ return;
+ }
+ uint8_t n_elems = 0;
+ uint8_t i;
+ for (i = 0; '\0' != world.player_inventory[i]; i++)
+ {
+ n_elems = n_elems + ('\n' == world.player_inventory[i]);
+ }
+ world.player_inventory_select = world.player_inventory_select
+ + (world.player_inventory_select < n_elems);
+}
+
+
+
static uint8_t try_0args(struct Command * command, char * match, void (* f) ())
{
if (!strcmp(command->dsc_short, match))