diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-03 19:21:09 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-03 19:21:09 +0000 |
| commit | 18fae33cd4b9d994191dda68cb7ffb4354855d02 (patch) | |
| tree | 6dd425bf823d5b9e7d45d5c8d3033d175c3adc0c /crawl-ref/source/spells4.cc | |
| parent | 7adf7a8dd69f6d22290d1d7cf9df5de6889f2411 (diff) | |
| download | crawl-ref-18fae33cd4b9d994191dda68cb7ffb4354855d02.tar.gz crawl-ref-18fae33cd4b9d994191dda68cb7ffb4354855d02.zip | |
For (some) consistency, make monster::foe an unsigned short, since that
matches player::pet_target, and because tags.cc seems to save
monster::foe as a short anyway.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5461 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells4.cc')
| -rw-r--r-- | crawl-ref/source/spells4.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index a2783d3626..22def56e72 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -482,9 +482,10 @@ void cast_sticks_to_snakes(int pow) return; } - const beh_type beha = item_cursed( you.inv[ weapon ] ) ? BEH_HOSTILE - : BEH_FRIENDLY; - const int hitting = (beha == BEH_HOSTILE) ? MHITYOU : you.pet_target; + const beh_type beha = item_cursed(you.inv[ weapon ]) ? BEH_HOSTILE + : BEH_FRIENDLY; + const unsigned short hitting = (beha == BEH_HOSTILE) ? MHITYOU + : you.pet_target; if ((you.inv[ weapon ].base_type == OBJ_MISSILES && (you.inv[ weapon ].sub_type == MI_ARROW))) |