summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/xom.h
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-26 23:24:34 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-26 23:24:34 +0000
commitf3b1762e5a7ce54cb41729e3d4cedf482c4a42e9 (patch)
treec30507d1b89fc4666967e913d39973c1c8b34bd9 /crawl-ref/source/xom.h
parent07a3ce3ad486d8cbf07a1fda8b50a1d3d87b6143 (diff)
downloadcrawl-ref-f3b1762e5a7ce54cb41729e3d4cedf482c4a42e9.tar.gz
crawl-ref-f3b1762e5a7ce54cb41729e3d4cedf482c4a42e9.zip
* Fix Xom's interest wrapping around from 0 to 255. (!!!)
* In xom_acts, if Xom was bored (and now did something bad) reroll interest. * Greatly decrease amusement derived from the player entering a new level. (However, entering a new level via escape hatch or shaft is REALLY amusing, more so the deeper the shaft.) * Xom may be amused if you are caught in a net and there are hostile monsters around. * Fix draconian tiles not showing up correctly for Detect Creatures. * Improve card descriptions output for Triple Draw/Stack Five. * In inventory, add '&' hotkey for useless (== inedible) chunks. Still needs documentation. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9557 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/xom.h')
-rw-r--r--crawl-ref/source/xom.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/xom.h b/crawl-ref/source/xom.h
index 0ecba36714..843a94bbbd 100644
--- a/crawl-ref/source/xom.h
+++ b/crawl-ref/source/xom.h
@@ -25,12 +25,12 @@ void xom_is_stimulated(int maxinterestingness,
void xom_is_stimulated(int maxinterestingness, const std::string& message,
bool force_message = false);
bool xom_is_nice();
-void xom_acts(bool niceness, int sever);
+void xom_acts(bool niceness, int sever, int tension = -1);
const char *describe_xom_favour();
-inline void xom_acts(int sever)
+inline void xom_acts(int sever, int tension = -1)
{
- xom_acts(xom_is_nice(), sever);
+ xom_acts(xom_is_nice(), sever, tension);
}
void xom_check_lost_item(const item_def& item);