summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/command.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-25 07:54:57 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-25 07:54:57 +0000
commit64066374ba039726a4ab7a7a9a7456f48f12b0ab (patch)
tree25648570d9ce5cb83495d9b1895a6bae536aa9a4 /crawl-ref/source/command.cc
parent18fa676cf1f8c9dd674bec700c095187fab2ab0b (diff)
downloadcrawl-ref-64066374ba039726a4ab7a7a9a7456f48f12b0ab.tar.gz
crawl-ref-64066374ba039726a4ab7a7a9a7456f48f12b0ab.zip
Fix 2026078: Quiver not updated after item slot adjustment.
Fix 2027292: potion_effect() adapting to vampire hunger for non-potion effects. Fix 2026910: Make !invisibility/resistance/speed use MSGCH_DURATION. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6679 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/command.cc')
-rw-r--r--crawl-ref/source/command.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 9a6f33c56d..355a9d91e7 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -296,18 +296,18 @@ void adjust(void)
void swap_inv_slots(int from_slot, int to_slot, bool verbose)
{
- // swap items
+ // Swap items.
item_def tmp = you.inv[to_slot];
- you.inv[to_slot] = you.inv[from_slot];
+ you.inv[to_slot] = you.inv[from_slot];
you.inv[from_slot] = tmp;
- // slot switching
+ // Slot switching.
tmp.slot = you.inv[to_slot].slot;
- you.inv[to_slot].slot = you.inv[from_slot].slot;
+ you.inv[to_slot].slot = you.inv[from_slot].slot;
you.inv[from_slot].slot = tmp.slot;
you.inv[from_slot].link = from_slot;
- you.inv[to_slot].link = to_slot;
+ you.inv[to_slot].link = to_slot;
for (int i = 0; i < NUM_EQUIP; i++)
{
@@ -330,6 +330,8 @@ void swap_inv_slots(int from_slot, int to_slot, bool verbose)
you.wield_change = true;
you.m_quiver->on_weapon_changed();
}
+ else // just to make sure
+ you.redraw_quiver = true;
}
static void _adjust_item(void)