diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-29 13:22:12 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-29 13:22:12 +0000 |
| commit | 031aedb7a9cfa7ad7d86fef1a0ae3b382d31ebb9 (patch) | |
| tree | 23d9f3d719f5a35a8f256f0df2bf4cfec61680e8 /crawl-ref/source/acr.cc | |
| parent | 883d0ce492391cc7cfeed1836b4a4e5fc5f4b24e (diff) | |
| download | crawl-ref-031aedb7a9cfa7ad7d86fef1a0ae3b382d31ebb9.tar.gz crawl-ref-031aedb7a9cfa7ad7d86fef1a0ae3b382d31ebb9.zip | |
Fix for bug 1622129, safe_autopickup check was happening before monster
movement. Autopickup is no longer a delay but rather receives special
handling (ouch, should be done better.) This necessitated removing a safety
assert() in delay.cc.
Also, you now get two messages when autopickup kicks in:
You see 2 scrolls of identify here.
C - 3 scrolls of identify
I consider this...a feature. Right.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@729 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 8b88aaf21a..5a3a678895 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -838,6 +838,9 @@ static void input() { middle_input(); + if ( need_to_autopickup() ) + autopickup(); + handle_delay(); gotoxy(18,9); |