--- deliantra/server/common/readable.C	2007/01/23 01:05:17	1.20
+++ deliantra/server/common/readable.C	2007/02/05 01:24:45	1.21
@@ -921,39 +921,39 @@
 
   switch (msgtype)
     {
-        case 1:                /*monster */
-          nbr = sizeof (mon_book_name) / sizeof (char *);
-          strcpy (name, mon_book_name[rndm (nbr)]);
-          break;
-        case 2:                /*artifact */
-          nbr = sizeof (art_book_name) / sizeof (char *);
-          strcpy (name, art_book_name[rndm (nbr)]);
-          break;
-        case 3:                /*spellpath */
-          nbr = sizeof (path_book_name) / sizeof (char *);
-          strcpy (name, path_book_name[rndm (nbr)]);
-          break;
-        case 4:                /*alchemy */
-          nbr = sizeof (formula_book_name) / sizeof (char *);
-          strcpy (name, formula_book_name[rndm (nbr)]);
-          break;
-        case 5:                /*gods */
-          nbr = sizeof (gods_book_name) / sizeof (char *);
-          strcpy (name, gods_book_name[rndm (nbr)]);
-          break;
-        case 6:                /*msg file */
-        default:
-          if (book->weight > 2000)
-            {                   /* based on weight */
-              nbr = sizeof (heavy_book_name) / sizeof (char *);
-              strcpy (name, heavy_book_name[rndm (nbr)]);
-            }
-          else if (book->weight < 2001)
-            {
-              nbr = sizeof (light_book_name) / sizeof (char *);
-              strcpy (name, light_book_name[rndm (nbr)]);
-            }
-          break;
+      case 1:                /*monster */
+        nbr = sizeof (mon_book_name) / sizeof (char *);
+        assign (name, mon_book_name[rndm (nbr)]);
+        break;
+      case 2:                /*artifact */
+        nbr = sizeof (art_book_name) / sizeof (char *);
+        assign (name, art_book_name[rndm (nbr)]);
+        break;
+      case 3:                /*spellpath */
+        nbr = sizeof (path_book_name) / sizeof (char *);
+        assign (name, path_book_name[rndm (nbr)]);
+        break;
+      case 4:                /*alchemy */
+        nbr = sizeof (formula_book_name) / sizeof (char *);
+        assign (name, formula_book_name[rndm (nbr)]);
+        break;
+      case 5:                /*gods */
+        nbr = sizeof (gods_book_name) / sizeof (char *);
+        assign (name, gods_book_name[rndm (nbr)]);
+        break;
+      case 6:                /*msg file */
+      default:
+        if (book->weight > 2000)
+          {                   /* based on weight */
+            nbr = sizeof (heavy_book_name) / sizeof (char *);
+            assign (name, heavy_book_name[rndm (nbr)]);
+          }
+        else if (book->weight < 2001)
+          {
+            nbr = sizeof (light_book_name) / sizeof (char *);
+            assign (name, light_book_name[rndm (nbr)]);
+          }
+        break;
     }
 
   book->name = name;
@@ -975,29 +975,29 @@
 
   switch (msgtype)
     {
-        case 1:                /* monster */
-          nbr = sizeof (mon_author) / sizeof (char *);
-          strcpy (name, mon_author[rndm (nbr)]);
-          break;
-        case 2:                /* artifacts */
-          nbr = sizeof (art_author) / sizeof (char *);
-          strcpy (name, art_author[rndm (nbr)]);
-          break;
-        case 3:                /* spellpath */
-          nbr = sizeof (path_author) / sizeof (char *);
-          strcpy (name, path_author[rndm (nbr)]);
-          break;
-        case 4:                /* alchemy */
-          nbr = sizeof (formula_author) / sizeof (char *);
-          strcpy (name, formula_author[rndm (nbr)]);
-          break;
-        case 5:                /* gods */
-          nbr = sizeof (gods_author) / sizeof (char *);
-          strcpy (name, gods_author[rndm (nbr)]);
-          break;
-        case 6:                /* msg file */
-        default:
-          strcpy (name, book_author[rndm (nbr)]);
+      case 1:                /* monster */
+        nbr = sizeof (mon_author) / sizeof (char *);
+        assign (name, mon_author[rndm (nbr)]);
+        break;
+      case 2:                /* artifacts */
+        nbr = sizeof (art_author) / sizeof (char *);
+        assign (name, art_author[rndm (nbr)]);
+        break;
+      case 3:                /* spellpath */
+        nbr = sizeof (path_author) / sizeof (char *);
+        assign (name, path_author[rndm (nbr)]);
+        break;
+      case 4:                /* alchemy */
+        nbr = sizeof (formula_author) / sizeof (char *);
+        assign (name, formula_author[rndm (nbr)]);
+        break;
+      case 5:                /* gods */
+        nbr = sizeof (gods_author) / sizeof (char *);
+        assign (name, gods_author[rndm (nbr)]);
+        break;
+      case 6:                /* msg file */
+      default:
+        assign (name, book_author[rndm (nbr)]);
     }
 
   sprintf (title, "of %s", name);
@@ -1415,7 +1415,7 @@
     }
 
   /* the base 'generic' name for our artifact */
-  strcpy (name, art_name_array[index].name);
+  assign (name, art_name_array[index].name);
 
   /* Ok, lets print out the contents */
   sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact");
@@ -1529,7 +1529,7 @@
       if (at->clone.type == SPELL && at->clone.path_attuned & pnum &&
           ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8)))
         {
-          strcpy (tmpbuf, at->clone.name);
+          assign (tmpbuf, at->clone.name);
 
           if (book_overflow (retbuf, tmpbuf, booksize))
             break;
@@ -1697,7 +1697,7 @@
     }
 
   if (msg && !book_overflow (retbuf, msg->name, booksize))
-    strcpy (retbuf, msg->name);
+    assign (retbuf, msg->name);
   else
     sprintf (retbuf, "\n <undecipherable text>");