summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ouch.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-18 20:43:51 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-18 20:43:51 +0000
commit4fc450cf552c4ce21fdc7baa0b7f748043b594ab (patch)
treecab06e1fafb5a522bffc6b9e8cf55de14acc5138 /crawl-ref/source/ouch.cc
parenta7186ba452056c22fdfd2436da9f03e7c82c0657 (diff)
downloadcrawl-ref-4fc450cf552c4ce21fdc7baa0b7f748043b594ab.tar.gz
crawl-ref-4fc450cf552c4ce21fdc7baa0b7f748043b594ab.zip
Apply vonbrand's patch in [2823698] to fix compilation under g++ 4.4.0.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10281 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/ouch.cc')
-rw-r--r--crawl-ref/source/ouch.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index ac3d8bc96d..491354444f 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -849,7 +849,7 @@ static void _maybe_spawn_jellies(int dam, const char* aux,
};
// Exclude torment damage
- char *ptr = strstr(aux, "torment");
+ const char *ptr = strstr(aux, "torment");
if (you.religion == GOD_JIYVA && you.piety >= 160 && ptr == NULL)
{
int how_many = 0;