diff options
| author | Jude Brown <bookofjude@users.sourceforge.net> | 2010-07-04 14:24:26 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2010-07-04 14:24:26 +1000 |
| commit | 87f8c553e8c1d3367c66d57b328e1e6a660cb580 (patch) | |
| tree | c9fa25a33160782fbc0e8621767933ab3181e563 /crawl-ref/source/cloud.h | |
| parent | 84195ed7461133dadf4c676b2d8f5ce8b0d38684 (diff) | |
| parent | 3cbb1e7fc11cfcd9d1726f5323f491b1d3c58019 (diff) | |
| download | crawl-ref-87f8c553e8c1d3367c66d57b328e1e6a660cb580.tar.gz crawl-ref-87f8c553e8c1d3367c66d57b328e1e6a660cb580.zip | |
Merge branch 'master' into holyhaul
Conflicts:
crawl-ref/source/cloud.cc
crawl-ref/source/mon-act.cc
Diffstat (limited to 'crawl-ref/source/cloud.h')
| -rw-r--r-- | crawl-ref/source/cloud.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/cloud.h b/crawl-ref/source/cloud.h index 48a3716feb..f2e76a8b14 100644 --- a/crawl-ref/source/cloud.h +++ b/crawl-ref/source/cloud.h @@ -74,8 +74,8 @@ int resist_fraction(int resist, int bonus_res = 0); int max_cloud_damage(cloud_type cl_type, int power = -1); void in_a_cloud(void); -std::string cloud_name(int cloudno); -std::string cloud_name(cloud_type type); +std::string cloud_name_at_index(int cloudno); +std::string cloud_type_name(cloud_type type, bool terse = true); int get_cloud_colour(int cloudno); bool is_damaging_cloud(cloud_type type, bool temp = false); |