summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/macro.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/macro.cc')
-rw-r--r--crawl-ref/source/macro.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index 2f2ad22ff3..5f2542bf39 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -101,16 +101,16 @@ static bool is_userfunction(const keyseq &seq)
return (userfunc_index(seq) != -1);
}
-const char *get_userfunction(int key)
+std::string get_userfunction(int key)
{
int index = userfunc_index(key);
- return (index == -1? NULL : userfunctions[index].c_str());
+ return (index == -1 ? NULL : userfunctions[index]);
}
-static const char *get_userfunction(const keyseq &seq)
+static std::string get_userfunction(const keyseq &seq)
{
int index = userfunc_index(seq);
- return (index == -1? NULL : userfunctions[index].c_str());
+ return (index == -1 ? NULL : userfunctions[index]);
}
static bool userfunc_referenced(int index, const macromap &mm)