From 8bbf783ead4517465445272f9144cf06bdac9be7 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 17 Sep 2016 09:58:14 +0200
Subject: Refactor object_type 'artifact name' field to std::string

We don't really need quarks for this since we're not nearly as
memory-constrained these days.
---
 src/loadsave.cc | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

(limited to 'src/loadsave.cc')

diff --git a/src/loadsave.cc b/src/loadsave.cc
index 6da23406..3f4ba47f 100644
--- a/src/loadsave.cc
+++ b/src/loadsave.cc
@@ -1141,31 +1141,15 @@ static void do_item(object_type *o_ptr, ls_flag_t flag)
 	// Inscription
 	do_std_string(o_ptr->inscription, flag);
 
-	/* Artifact name */
-	if (flag == ls_flag_t::LOAD)
-	{
-		char buf[128];
-		load_string(buf, 128);
-		if (buf[0])
-		{
-			o_ptr->art_name = quark_add(buf);
-		}
-	}
-	if (flag == ls_flag_t::SAVE)
-	{
-		if (o_ptr->art_name)
-		{
-			save_string(quark_str(o_ptr->art_name));
-		}
-		else
-		{
-			save_string("");
-		}
-	}
+	// Artifact name
+	do_std_string(o_ptr->artifact_name, flag);
+
+	/* Stick any more shared code before this. The rest
+	   of this function is reserved for ls_flag_t::LOAD's
+	   cleanup functions */
+
+	if (flag == ls_flag_t::SAVE) return;
 
-	if (flag == ls_flag_t::SAVE) return ; 	/* Stick any more shared code before this. The rest
-										   of this function is reserved for ls_flag_t::LOAD's
-										   cleanup functions */
 	/*********** END OF ls_flag_t::SAVE ***************/
 
 	/* Obtain the "kind" template */
@@ -1248,7 +1232,7 @@ static void do_item(object_type *o_ptr, ls_flag_t flag)
 		o_ptr->ds = old_ds;
 	}
 
-	if (o_ptr->art_name)		/* A random artifact */
+	if (!o_ptr->artifact_name.empty())	/* A random artifact */
 	{
 		o_ptr->dd = old_dd;
 		o_ptr->ds = old_ds;
-- 
cgit v1.2.3