From 6bbd3e9e43fddca75b87d5bca1fc1a37faf87357 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 24 Oct 2009 16:26:48 +0200 Subject: Convert player::your_name to std::string. Doesn't seem to break anything... --- crawl-ref/source/ouch.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'crawl-ref/source/ouch.cc') diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index d18060aa54..21bba6736e 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -1128,7 +1128,7 @@ static std::string morgue_name(time_t when_crawl_got_even) #ifdef SHORT_FILE_NAMES return "morgue"; #else // !SHORT_FILE_NAMES - std::string name = "morgue-" + std::string(you.your_name); + std::string name = "morgue-" + you.your_name; if (tm *loc = TIME_FN(&when_crawl_got_even)) { @@ -1180,11 +1180,11 @@ void end_game( scorefile_entry &se ) { const level_id &place(*i); unlink( - make_filename( you.your_name, - place.absdepth(), - place.branch, - place.level_type, - false ).c_str() ); + make_filename(you.your_name, + place.absdepth(), + place.branch, + place.level_type, + false).c_str()); } // temp levels, if any @@ -1198,7 +1198,7 @@ void end_game( scorefile_entry &se ) LEVEL_PORTAL_VAULT, false ).c_str() ); // create base file name - std::string basename = get_savedir_filename( you.your_name, "", "" ); + std::string basename = get_savedir_filename(you.your_name, "", ""); const char* suffixes[] = { #ifdef CLUA_BINDINGS @@ -1245,7 +1245,7 @@ void end_game( scorefile_entry &se ) clrscr(); clrscr(); - cprintf( "Goodbye, %s.", you.your_name ); + cprintf("Goodbye, %s.", you.your_name.c_str()); cprintf( EOL EOL " " ); // Space padding where # would go in list format std::string hiscore = hiscores_format_single_long( se, true ); -- cgit v1.2.3-54-g00ecf