summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/items.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-24 07:52:37 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-24 07:52:37 +0000
commitce05e64645f5e9ba07c5b8b72d0da8d5f8cecb28 (patch)
tree4e546f0e70ac9c88be6c39358089d783a96ec0f0 /crawl-ref/source/items.cc
parenteedd926a2de32ac965b9cae1dd30242f75c479f5 (diff)
downloadcrawl-ref-ce05e64645f5e9ba07c5b8b72d0da8d5f8cecb28.tar.gz
crawl-ref-ce05e64645f5e9ba07c5b8b72d0da8d5f8cecb28.zip
Change quiver output to that of the next item actually fired. Currently
updates correctly on firing and dropping quivered items. May be buggy. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6107 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/items.cc')
-rw-r--r--crawl-ref/source/items.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 613c2dee8e..c5d298eb6d 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1568,7 +1568,7 @@ int move_item_to_player( int obj, int quant_got, bool quiet )
if (freeslot < 0 || freeslot >= ENDOFPACK
|| is_valid_item(you.inv[freeslot]))
{
- // Something is terribly wrong
+ // Something is terribly wrong.
return (-1);
}
@@ -1577,12 +1577,12 @@ int move_item_to_player( int obj, int quant_got, bool quiet )
dgn_event(DET_ITEM_PICKUP, pos, 0, obj, -1), pos);
item_def &item = you.inv[freeslot];
- // copy item
+ // Copy item.
item = mitm[obj];
item.x = -1;
item.y = -1;
item.link = freeslot;
- // remove "dropped by ally" flag
+ // Remove "dropped by ally" flag.
item.flags &= ~(ISFLAG_DROPPED_BY_ALLY);
if (!item.slot)
@@ -1598,7 +1598,7 @@ int move_item_to_player( int obj, int quant_got, bool quiet )
{
if (quant_got != mitm[obj].quantity)
{
- // remove oldest timers from original stack
+ // Remove oldest timers from original stack.
for (int i = 0; i < quant_got; i++)
remove_oldest_blood_potion(mitm[obj]);