summaryrefslogtreecommitdiff
path: root/src/util.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-02-05 19:22:46 +0100
committerBardur Arantsson <bardur@scientician.net>2016-02-05 19:22:46 +0100
commit437b72f56737f16356ba61d769d85d85b7e70926 (patch)
tree8245229926f324cc5994e05a13252428d4afab24 /src/util.cc
parent5cecddb28bf224e06fc062ed430dd8322b2d3cff (diff)
Make get_player_race_name() return a std::string
Diffstat (limited to 'src/util.cc')
-rw-r--r--src/util.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/util.cc b/src/util.cc
index 8f3374d5..efbd4e38 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -3430,27 +3430,23 @@ std::string get_day(s32b day_no)
}
}
-cptr get_player_race_name(int pr, int ps)
+std::string get_player_race_name(int pr, int ps)
{
- static char buf[50];
-
if (ps)
{
if (race_mod_info[ps].place)
{
- sprintf(buf, "%s %s", race_info[pr].title, race_mod_info[ps].title);
+ return std::string(race_info[pr].title) + " " + race_mod_info[ps].title;
}
else
{
- sprintf(buf, "%s %s", race_mod_info[ps].title, race_info[pr].title);
+ return std::string(race_mod_info[ps].title) + " " + race_info[pr].title;
}
}
else
{
- sprintf(buf, "%s", race_info[pr].title);
+ return std::string(race_info[pr].title);
}
-
- return (buf);
}
/*