diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-03 18:21:16 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-03 18:21:16 +0000 |
| commit | e07f3d2b4000a41b48a19e42c40f8b6eed22af32 (patch) | |
| tree | 426c75b7c38e47fcd97b65566793dcca263a237e /crawl-ref/source/spells4.cc | |
| parent | 4784853d9f621bfdd83d72fec2641c138d5ac96f (diff) | |
| download | crawl-ref-e07f3d2b4000a41b48a19e42c40f8b6eed22af32.tar.gz crawl-ref-e07f3d2b4000a41b48a19e42c40f8b6eed22af32.zip | |
Revert the previous int -> unsigned in changes, as they don't match some
of the code elsewhere.
Weird bits:
monsters::foe and player::pet_target are used interchangeably, but the
former is an unsigned int, while the latter is an unsigned short. Both
of these can be set using the return value of monster_index(), which is
a signed int. Most of the functions that use these expect signed ints,
as well. ???
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5459 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells4.cc')
| -rw-r--r-- | crawl-ref/source/spells4.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 8f8c30df7b..a2783d3626 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -484,8 +484,7 @@ void cast_sticks_to_snakes(int pow) const beh_type beha = item_cursed( you.inv[ weapon ] ) ? BEH_HOSTILE : BEH_FRIENDLY; - const unsigned int hitting = (beha == BEH_HOSTILE) ? MHITYOU - : you.pet_target; + const int hitting = (beha == BEH_HOSTILE) ? MHITYOU : you.pet_target; if ((you.inv[ weapon ].base_type == OBJ_MISSILES && (you.inv[ weapon ].sub_type == MI_ARROW))) |