summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-16 04:13:31 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-16 04:13:31 +0000
commit54e0fc3576aff1552beaff81e869d9ae2282ec69 (patch)
tree07d3f3808170b4d1ab05bbc2bb92dddd4346a586 /crawl-ref/source/item_use.cc
parent9a0858b7feb5bf49f6897c44caf52b6accfd6230 (diff)
downloadcrawl-ref-54e0fc3576aff1552beaff81e869d9ae2282ec69.tar.gz
crawl-ref-54e0fc3576aff1552beaff81e869d9ae2282ec69.zip
[1871387] Fixed issue where the wrong tile was used for weapons of returning.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3280 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 14adf663b5..653637897e 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2406,7 +2406,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
else
{
// Dropping item copy, since the launched item might be different.
- fire_beam(pbolt, did_return? NULL : &item);
+ fire_beam(pbolt, &item, !did_return);
// The item can be destroyed before returning.
if (returning && thrown_object_destroyed(&item, pbolt.target_x,
@@ -2421,7 +2421,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
// Fire beam in reverse
pbolt.setup_retrace();
viewwindow(true, false);
- fire_beam(pbolt, NULL);
+ fire_beam(pbolt, &item, false);
msg::stream << item.name(DESC_CAP_THE) << " returns to your pack!"
<< std::endl;