diff options
| author | pubby <pubby8@gmail.com> | 2013-10-01 17:32:34 -0500 |
|---|---|---|
| committer | pubby <pubby8@gmail.com> | 2013-10-01 17:32:34 -0500 |
| commit | 2057b86a740fdaf7c9879ee9c9bd7dd296685c73 (patch) | |
| tree | c1d9b88b860230dce07aa81a1ecd3a0b6c5917a1 /crawl-ref/source/monster.h | |
| parent | 65c58ed6ccd53a9a080255ee37e131123ac65e96 (diff) | |
| parent | e7b95c8c9b3bd68a43ba0da89221226cd41dcc80 (diff) | |
| download | crawl-ref-2057b86a740fdaf7c9879ee9c9bd7dd296685c73.tar.gz crawl-ref-2057b86a740fdaf7c9879ee9c9bd7dd296685c73.zip | |
Merge branch 'master' into dwants
Conflicts:
crawl-ref/source/dat/des/variable/mini_monsters.des
crawl-ref/source/enum.h
crawl-ref/source/itemprop.cc
crawl-ref/source/main.cc
crawl-ref/source/mutation-data.h
crawl-ref/source/mutation.cc
crawl-ref/source/newgame.cc
crawl-ref/source/ng-restr.cc
crawl-ref/source/rltiles/dc-player.txt
crawl-ref/source/spl-selfench.cc
crawl-ref/source/throw.cc
crawl-ref/source/tilepick-p.cc
crawl-ref/source/wiz-you.cc
Diffstat (limited to 'crawl-ref/source/monster.h')
| -rw-r--r-- | crawl-ref/source/monster.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/monster.h b/crawl-ref/source/monster.h index 213fd82d2f..ce17995c41 100644 --- a/crawl-ref/source/monster.h +++ b/crawl-ref/source/monster.h @@ -262,7 +262,7 @@ public: bool pickup_gold(item_def &item, int near); bool pickup_launcher(item_def &launcher, int near, bool force = false); bool pickup_melee_weapon(item_def &item, int near); - bool pickup_throwable_weapon(item_def &item, int near); + bool pickup_missile(item_def &item, int near); bool pickup_weapon(item_def &item, int near, bool force); bool pickup_armour(item_def &item, int near, bool force); bool pickup_jewellery(item_def &item, int near, bool force); @@ -310,6 +310,7 @@ public: bool can_safely_mutate() const; bool can_polymorph() const; bool can_bleed(bool allow_tran = true) const; + bool is_stationary() const; bool malmutate(const string &reason); bool polymorph(int pow); void banish(actor *agent, const string &who = ""); @@ -507,7 +508,7 @@ private: bool need_message(int &near) const; bool level_up(); bool level_up_change(); - bool pickup(item_def &item, int slot, int near, bool force_merge = false); + bool pickup(item_def &item, int slot, int near); void equip_weapon(item_def &item, int near, bool msg = true); void equip_armour(item_def &item, int near); void equip_jewellery(item_def &item, int near); |