summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ng-input.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2010-04-22 11:13:49 +0200
committerRobert Vollmert <rvollmert@gmx.net>2010-04-22 11:13:49 +0200
commit33eb4bb65b0be194cf75a22f095f1b81787000ce (patch)
treee00798f86887340e7821ba8b1e05e72b96e8d1ee /crawl-ref/source/ng-input.cc
parentc0e0b5cdb614090bd62b926681827bff29b4d0e3 (diff)
downloadcrawl-ref-33eb4bb65b0be194cf75a22f095f1b81787000ce.tar.gz
crawl-ref-33eb4bb65b0be194cf75a22f095f1b81787000ce.zip
Don't modify name in is_good_name().
In particular, don't replace blank names with Options.prev_name. This means that we can now just use a blank name if we want to ask for the name later.
Diffstat (limited to 'crawl-ref/source/ng-input.cc')
-rw-r--r--crawl-ref/source/ng-input.cc20
1 files changed, 1 insertions, 19 deletions
diff --git a/crawl-ref/source/ng-input.cc b/crawl-ref/source/ng-input.cc
index f742ae2e99..c828414406 100644
--- a/crawl-ref/source/ng-input.cc
+++ b/crawl-ref/source/ng-input.cc
@@ -62,26 +62,8 @@ static void _show_name_prompt(int where)
textcolor( LIGHTGREY );
}
-static void _preprocess_character_name(std::string &name, bool blankOK)
+bool is_good_name(const std::string& name, bool blankOK, bool verbose)
{
- if (name.empty() && blankOK && Options.prev_name.length()
- && Options.remember_name)
- {
- name = Options.prev_name;
- }
-
- // '.', '?' and '*' are blanked.
- if (name.length() == 1
- && (name[0] == '.' || name[0] == '*' || name[0] == '?'))
- {
- name = "";
- }
-}
-
-bool is_good_name(std::string &name, bool blankOK, bool verbose)
-{
- _preprocess_character_name(name, blankOK);
-
// verification begins here {dlb}:
if (name.empty())
{