summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2011-04-16 20:35:48 +0200
committerBardur Arantsson <bardur@scientician.net>2012-03-29 20:26:32 +0200
commita82d2275b5e3cebf845580c30c2779855c889a93 (patch)
treebed6a7a275c333c0bfe4ef7aef88b8d6ece4b9cf /src
parent7e4fd1acfc86cd696803af855eca966ad27cffeb (diff)
Always show selections for inventory/equipment.
Diffstat (limited to 'src')
-rw-r--r--src/cmd3.c6
-rw-r--r--src/cmd6.c1
-rw-r--r--src/dungeon.c4
-rw-r--r--src/externs.h1
-rw-r--r--src/object1.c101
-rw-r--r--src/store.c6
-rw-r--r--src/variable.c1
7 files changed, 15 insertions, 105 deletions
diff --git a/src/cmd3.c b/src/cmd3.c
index 34d841d4..c728756a 100644
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -68,9 +68,6 @@ void do_cmd_inven(void)
/* Process normal keys */
else
{
- /* Hack -- Use "display" mode */
- command_see = TRUE;
-
/* Mega-Hack -- Don't disable keymaps for this key */
request_command_inven_mode = TRUE;
}
@@ -133,9 +130,6 @@ void do_cmd_equip(void)
/* Process normal keys */
else
{
- /* Enter "display" mode */
- command_see = TRUE;
-
/* Mega-Hack -- Don't disable keymaps for this key */
request_command_inven_mode = TRUE;
}
diff --git a/src/cmd6.c b/src/cmd6.c
index 4f6c96ab..6caa648a 100644
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -4927,7 +4927,6 @@ void do_cmd_activate(void)
item_tester_hook = item_tester_hook_activate;
/* Get an item */
- command_see = TRUE;
command_wrk = USE_EQUIP;
q = "Activate which item? ";
s = "You have nothing to activate.";
diff --git a/src/dungeon.c b/src/dungeon.c
index 6867abbf..88bda7db 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -4497,10 +4497,6 @@ void process_player(void)
}
- /* Hack -- cancel "lurking browse mode" */
- if (!command_new) command_see = FALSE;
-
-
/* Assume free turn */
energy_use = 0;
diff --git a/src/externs.h b/src/externs.h
index 9c7fc426..0e054481 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -126,7 +126,6 @@ extern s16b command_cmd;
extern s16b command_arg;
extern s16b command_rep;
extern s16b command_dir;
-extern s16b command_see;
extern s16b command_wrk;
extern s16b command_new;
extern s32b energy_use;
diff --git a/src/object1.c b/src/object1.c
index 7304c00a..ee22d7e7 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -5452,9 +5452,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
/* Require at least one legal choice */
if (!allow_inven && !allow_equip && !allow_floor)
{
- /* Cancel command_see */
- command_see = FALSE;
-
/* Oops */
oops = TRUE;
@@ -5466,8 +5463,7 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
else
{
/* Hack -- Start on equipment if requested */
- if (command_see && (command_wrk == (USE_EQUIP))
- && allow_equip)
+ if ((command_wrk == (USE_EQUIP)) && allow_equip)
{
command_wrk = (USE_EQUIP);
}
@@ -5491,12 +5487,8 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
}
}
- /* Hack -- start out in "display" mode */
- if (command_see)
- {
- /* Save screen */
- screen_save();
- }
+ /* Save screen */
+ screen_save();
/* Repeat until done */
while (!done)
@@ -5545,10 +5537,8 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
n1 = I2A(i1);
n2 = I2A(i2);
- /* Redraw if needed */
- if (command_see) {
- show_inven();
- }
+ /* Redraw */
+ show_inven();
}
/* Equipment screen */
@@ -5558,10 +5548,8 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
n1 = I2A(e1 - INVEN_WIELD);
n2 = I2A(e2 - INVEN_WIELD);
- /* Redraw if needed */
- if (command_see) {
- show_equip();
- }
+ /* Redraw */
+ show_equip();
}
/* Floor screen */
@@ -5574,8 +5562,8 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
n1 = I2A(j - floor_top);
n2 = I2A(k - floor_top);
- /* Redraw if needed */
- if (command_see) show_floor(p_ptr->py, p_ptr->px);
+ /* Redraw */
+ show_floor(p_ptr->py, p_ptr->px);
}
/* Viewing inventory */
@@ -5591,9 +5579,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
/* Append */
strcat(out_val, tmp_val);
- /* Indicate ability to "view" */
- if (!command_see) strcat(out_val, " * to see,");
-
/* Append */
if (allow_equip) strcat(out_val, " / for Equip,");
@@ -5614,9 +5599,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
/* Append */
strcat(out_val, tmp_val);
- /* Indicate ability to "view" */
- if (!command_see) strcat(out_val, " * to see,");
-
/* Append */
if (allow_inven) strcat(out_val, " / for Inven,");
@@ -5636,9 +5618,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
/* Append */
strcat(out_val, tmp_val);
- /* Indicate ability to "view" */
- if (!command_see) strcat(out_val, " * to see,");
-
/* Append */
if (allow_inven)
{
@@ -5686,32 +5665,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
break;
}
- case '*':
- case '?':
- case ' ':
- {
- /* Hide the list */
- if (command_see)
- {
- /* Flip flag */
- command_see = FALSE;
-
- /* Load screen */
- screen_load();
- }
-
- /* Show the list */
- else
- {
- /* Save screen */
- screen_save();
-
- /* Flip flag */
- command_see = TRUE;
- }
- break;
- }
-
case '/':
{
if (command_wrk == (USE_INVEN))
@@ -5750,14 +5703,8 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
}
/* Hack -- Fix screen */
- if (command_see)
- {
- /* Load screen */
- screen_load();
-
- /* Save screen */
- screen_save();
- }
+ screen_load();
+ screen_save();
/* Need to redraw */
break;
@@ -5802,14 +5749,8 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
}
/* Hack -- Fix screen */
- if (command_see)
- {
- /* Load screen */
- screen_load();
-
- /* Save screen */
- screen_save();
- }
+ screen_load();
+ screen_save();
command_wrk = (USE_FLOOR);
@@ -6013,16 +5954,8 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
}
}
- /* Fix the screen if necessary */
- if (command_see)
- {
- /* Load screen */
- screen_load();
-
- /* Hack -- Cancel "display" */
- command_see = FALSE;
- }
-
+ /* Fix the screen */
+ screen_load();
/* Forget the item_tester_tval restriction */
item_tester_tval = 0;
@@ -6112,9 +6045,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
* to allow the user to enter a command while viewing those screens, and
* also to induce "auto-enter" of stores, and other such stuff.
*
- * Global "p_ptr->command_see" may be set before calling this function to start
- * out in "browse" mode. It is cleared before this function returns.
- *
* Global "p_ptr->command_wrk" is used to choose between equip/inven listings.
* If it is TRUE then we are viewing inventory, else equipment.
*
@@ -6124,7 +6054,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
bool_ get_item(int *cp, cptr pmt, cptr str, int mode)
{
automatizer_create = FALSE;
- command_see = TRUE; /* Start out displaying all alternatives. */
return get_item_floor(cp, pmt, str, mode);
}
diff --git a/src/store.c b/src/store.c
index 9e9a77a6..7da01b87 100644
--- a/src/store.c
+++ b/src/store.c
@@ -3923,9 +3923,6 @@ void do_cmd_store(void)
/* Hack -- Cancel automatic command */
command_new = 0;
- /* Hack -- Cancel "see" mode */
- command_see = FALSE;
-
/* Mega-Hack -- Clear the 'ignore-keymaps' list */
memset(request_command_ignore_keymaps, 0, 12);
@@ -4393,9 +4390,6 @@ void do_cmd_home_trump(void)
/* Hack -- Cancel automatic command */
command_new = 0;
- /* Hack -- Cancel "see" mode */
- command_see = FALSE;
-
/* Mega-Hack -- Clear the 'ignore-keymaps' list */
memset(request_command_ignore_keymaps, 0, 12);
diff --git a/src/variable.c b/src/variable.c
index a0c8debb..26c377fa 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -88,7 +88,6 @@ s16b command_arg; /* Gives argument of current command */
s16b command_rep; /* Gives repetition of current command */
s16b command_dir; /* Gives direction of current command */
-s16b command_see; /* See "cmd1.c" */
s16b command_wrk; /* See "cmd1.c" */
s16b command_new; /* Command chaining from inven/equip view */