diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-25 23:21:20 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-25 23:21:20 +0000 |
commit | 825ce05506d9462865c132cef30fcf1f42d0e4ba (patch) | |
tree | 7f364ae065eddc348ccc1cf02abcd88e5985d72f | |
parent | b492473c4686dd26b50c4a5bb7a533ec105e7fde (diff) | |
download | crawl-ref-825ce05506d9462865c132cef30fcf1f42d0e4ba.tar.gz crawl-ref-825ce05506d9462865c132cef30fcf1f42d0e4ba.zip |
Apply trunk r10411 to 0.5.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10412 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/delay.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 83694d2a54..e7d4200907 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -258,8 +258,9 @@ static int _push_delay(const delay_queue_item &delay) { if (_is_parent_delay( i->type )) { + size_t pos = i - you.delay_queue.begin(); you.delay_queue.insert(i, delay); - return (i - you.delay_queue.begin()); + return (pos); } } you.delay_queue.push_back( delay ); |