diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-08-25 20:47:27 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-08-25 20:47:27 +0000 |
commit | 5c7d640f2cadbf0048d9c5c81e427e3ce1d5af0f (patch) | |
tree | 93a5c82c996abe9264fd56d00750bedec10ac367 /crawl-ref/source/beam.cc | |
parent | cb76f80426af8941a42b7346aacba92529e41338 (diff) | |
download | crawl-ref-5c7d640f2cadbf0048d9c5c81e427e3ce1d5af0f.tar.gz crawl-ref-5c7d640f2cadbf0048d9c5c81e427e3ce1d5af0f.zip |
A few minor changes.
Bugfixes:
- vampire bats couldn't untransform
- / of polymorph other do not autoID if you zap at yourself
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2032 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r-- | crawl-ref/source/beam.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 94c86b620f..c1fbdd170c 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -40,6 +40,7 @@ #include "enum.h" #include "it_use2.h" #include "items.h" +#include "itemname.h" #include "itemprop.h" #include "misc.h" #include "monplace.h" @@ -3170,10 +3171,16 @@ static int affect_player( bolt &beam ) { mpr("Strange energies course through your body."); you.mutate(); + beam.obvious_effect = true; } - else + else if (get_ident_type(OBJ_WANDS, WAND_POLYMORPH_OTHER) == ID_KNOWN_TYPE) + { mpr("This is polymorph other only!"); - beam.obvious_effect = true; + } + else + { + canned_msg( MSG_NOTHING_HAPPENS ); + } break; case BEAM_SLOW: |