summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/direct.h
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-16 17:11:06 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-16 17:11:06 +0000
commitb8ba267261e0586c01fad1c5f280d1fd16cd44ca (patch)
treedad33a9139ffe9c7bba93005f95f053e8a939340 /crawl-ref/source/direct.h
parent5a01c6b4c075124a30e6ede371ba74bc58b504f8 (diff)
downloadcrawl-ref-b8ba267261e0586c01fad1c5f280d1fd16cd44ca.tar.gz
crawl-ref-b8ba267261e0586c01fad1c5f280d1fd16cd44ca.zip
FR 1836617: Add item brand for plants (and mimics) in Tiles.
FR 1870291: Give a message when gaining exp for killing monsters outside LOS. (This is something the player can find out by checking their xp pool, anyway, so it's not like it gives anything away. Currently does not happen for pet kills, should it?) Implement 1829910: Make Daevas fully resist negative energy, with the reasoning that TSO will protect them. Also, fix dragon slaying to actually have an effect on draconian players (whoops!) as well as on characters in Dragon Form. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3282 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/direct.h')
-rw-r--r--crawl-ref/source/direct.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/direct.h b/crawl-ref/source/direct.h
index 839b84ebe9..125b045ad1 100644
--- a/crawl-ref/source/direct.h
+++ b/crawl-ref/source/direct.h
@@ -168,13 +168,13 @@ std::string get_monster_desc(const monsters *mon,
int dos_direction_unmunge(int doskey);
-std::string feature_description(int mx, int my,
+std::string feature_description(int mx, int my, bool bloody = false,
description_level_type dtype = DESC_CAP_A,
bool add_stop = true);
std::string raw_feature_description(dungeon_feature_type grid,
trap_type tr = NUM_TRAPS);
-std::string feature_description(dungeon_feature_type grid,
- trap_type trap = NUM_TRAPS,
+std::string feature_description(dungeon_feature_type grid,
+ trap_type trap = NUM_TRAPS, bool bloody = false,
description_level_type dtype = DESC_CAP_A,
bool add_stop = true);