summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-30 16:25:16 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-30 16:25:16 +0000
commit56f6f73efb98b03485b34d334ef72585e4ee41a7 (patch)
tree2f9afd2e5466908bd559a8b3315d433b9a4c47e1 /crawl-ref
parent29c92e989d47c6e35366e01f9e1e0bd09755d056 (diff)
downloadcrawl-ref-56f6f73efb98b03485b34d334ef72585e4ee41a7.tar.gz
crawl-ref-56f6f73efb98b03485b34d334ef72585e4ee41a7.zip
Fix dangling pointers again (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6252 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/xom.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 3d76984a5c..3d5f453107 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -820,13 +820,13 @@ static bool _xom_is_bad(int sever)
}
else if (random2(sever) <= 8)
{
- const char *speech = _get_xom_speech("draining or torment").c_str();
+ std::string speech = _get_xom_speech("draining or torment");
if (one_chance_in(4))
{
if (player_prot_life() < 3)
{
- god_speaks(GOD_XOM, speech);
+ god_speaks(GOD_XOM, speech.c_str());
drain_exp();
if (random2(sever) > 3)
@@ -841,7 +841,7 @@ static bool _xom_is_bad(int sever)
{
if (!player_res_torment())
{
- god_speaks(GOD_XOM, speech);
+ god_speaks(GOD_XOM, speech.c_str());
torment_player(0, TORMENT_XOM);
@@ -851,12 +851,12 @@ static bool _xom_is_bad(int sever)
}
else if (random2(sever) <= 9)
{
- const char *speech = _get_xom_speech("hostile monster").c_str();
+ std::string speech = _get_xom_speech("hostile monster");
// Nasty, but fun.
if (one_chance_in(4))
{
- god_speaks(GOD_XOM, speech);
+ god_speaks(GOD_XOM, speech.c_str());
cast_tukimas_dance(100, GOD_XOM, true);
@@ -882,7 +882,7 @@ static bool _xom_is_bad(int sever)
if (success)
{
- god_speaks(GOD_XOM, speech);
+ god_speaks(GOD_XOM, speech.c_str());
done = true;
}