Allow spaces, dashes and periods in character names.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@607 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 2 deletions

diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc
index 30bfc1b32c..181dd180bf 100644
--- a/crawl-ref/source/libutil.cc
+++ b/crawl-ref/source/libutil.cc
@@ -70,6 +70,11 @@ void play_sound( const char *file )
 #endif
 }
 
+std::string strip_filename_unsafe_chars(const std::string &s)
+{
+    return replace_all_of(s, " .", "");
+}
+
 std::string make_stringf(const char *s, ...)
 {
     va_list args;
@@ -96,7 +101,7 @@ void lowercase(std::string &s)
         s[i] = tolower(s[i]);
 }
 
-std::string replace_all(std::string s,
+std::string replace_all_of(std::string s,
                         const std::string &tofind,
                         const std::string &replacement)
 {
@@ -105,7 +110,7 @@ std::string replace_all(std::string s,
    
     while ((found = s.find_first_of(tofind, start)) != std::string::npos)
     {
-        s.replace( found, tofind.length(), replacement );
+        s.replace( found, 1, replacement );
         start = found + replacement.length();
     }