summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-20 05:33:07 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-20 05:33:07 +0000
commitf2972cf05bb68980e8b6a02fc41ea279988f5129 (patch)
tree5351f9bd54f3affe430f604f950e26a7591eb92e /crawl-ref/source/initfile.cc
parenta7eaf9dc5ed07e066b9ec33eacc1fce15b817cff (diff)
downloadcrawl-ref-f2972cf05bb68980e8b6a02fc41ea279988f5129.tar.gz
crawl-ref-f2972cf05bb68980e8b6a02fc41ea279988f5129.zip
Add miscellaneous minor cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8617 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index cf02e7b457..70730c3e08 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -247,7 +247,7 @@ static int _str_to_book( const std::string& str )
if (str == "random")
return SBT_RANDOM;
- return SBT_NO_SELECTION;
+ return (SBT_NO_SELECTION);
}
static int _str_to_weapon( const std::string &str )
@@ -272,7 +272,7 @@ static int _str_to_weapon( const std::string &str )
return (WPN_UNKNOWN);
}
-std::string weapon_to_str( int weapon )
+static std::string _weapon_to_str( int weapon )
{
switch (weapon)
{
@@ -1263,7 +1263,7 @@ static void write_newgame_options(FILE *f)
fprintf(f, "class = %c\n", Options.prev_cls);
if (Options.prev_weapon != WPN_UNKNOWN)
- fprintf(f, "weapon = %s\n", weapon_to_str(Options.prev_weapon).c_str());
+ fprintf(f, "weapon = %s\n", _weapon_to_str(Options.prev_weapon).c_str());
if (Options.prev_ck != GOD_NO_GOD)
{