From 0eab7f1626d7950dbf38451b33768ba4d209686a Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 26 Jun 2012 09:31:43 +0200 Subject: Show skills immediately on "m" menu --- src/skills.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/skills.c b/src/skills.c index 4de0b047..c343dcce 100644 --- a/src/skills.c +++ b/src/skills.c @@ -754,12 +754,12 @@ void select_default_melee() /* * Print a batch of skills. */ -static void print_skill_batch(int *p, cptr *p_desc, int start, int max, bool_ mode) +static void print_skill_batch(int *p, cptr *p_desc, int start, int max) { char buff[80]; int i = start, j = 0; - if (mode) prt(format(" %-31s", "Name"), 1, 20); + prt(format(" %-31s", "Name"), 1, 20); for (i = start; i < (start + 20); i++) { @@ -770,10 +770,10 @@ static void print_skill_batch(int *p, cptr *p_desc, int start, int max, bool_ mo else sprintf(buff, " %c - %d) %-30s", I2A(j), p[i], "Change melee style"); - if (mode) prt(buff, 2 + j, 20); + prt(buff, 2 + j, 20); j++; } - if (mode) prt("", 2 + j, 20); + prt("", 2 + j, 20); prt(format("Select a skill (a-%c), @ to select by name, +/- to scroll:", I2A(j - 1)), 0, 0); } @@ -782,7 +782,6 @@ int do_cmd_activate_skill_aux() char which; int max = 0, i, start = 0; int ret; - bool_ mode = FALSE; int *p; cptr *p_desc; @@ -855,7 +854,7 @@ int do_cmd_activate_skill_aux() while (1) { - print_skill_batch(p, p_desc, start, max, mode); + print_skill_batch(p, p_desc, start, max); which = inkey(); if (which == ESCAPE) @@ -863,12 +862,6 @@ int do_cmd_activate_skill_aux() ret = -1; break; } - else if (which == '*' || which == '?' || which == ' ') - { - mode = (mode) ? FALSE : TRUE; - Term_load(); - character_icky = FALSE; - } else if (which == '+') { start += 20; -- cgit v1.2.3