diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 16:04:24 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 16:04:24 +0000 |
| commit | 280d409759be7af8b54366f07ccba17348ea24f9 (patch) | |
| tree | 99b931599c7a6544a9c9b3f4aeb7d9c99752b5d9 /crawl-ref/source/beam.h | |
| parent | 8b4a043aa12cf1492ff94b0ef071afce5997dff2 (diff) | |
| download | crawl-ref-280d409759be7af8b54366f07ccba17348ea24f9.tar.gz crawl-ref-280d409759be7af8b54366f07ccba17348ea24f9.zip | |
Commit several patches:
* patch 2849505 by weyrava: make submerged monsters use the correct colour
* patch 2857771 by caotto: another Feawn update
* patch 2838771 by camedo: add potions of brilliance/agility
* BR 2841651 by bookofjude: allow Merfolk to control-tele into deep water
Now we need tiles for the new potions!
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10669 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.h')
| -rw-r--r-- | crawl-ref/source/beam.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.h b/crawl-ref/source/beam.h index 94c0e432d0..12ea00041c 100644 --- a/crawl-ref/source/beam.h +++ b/crawl-ref/source/beam.h @@ -215,7 +215,7 @@ private: // operate on the beam's current position (i.e., whatever pos() // returns.) public: - void affect_cell(); + void affect_cell(bool avoid_self = false); void affect_wall(); void affect_monster( monsters* m ); void affect_player(); |