--- deliantra/server/common/loader.C	2007/07/01 05:00:17	1.90
+++ deliantra/server/common/loader.C	2007/08/01 01:07:42	1.95
@@ -639,6 +639,14 @@
             face = face_find (f.get_str ());
             break;
 
+          case KW_sound:
+            sound = sound_find (f.get_str ());
+            break;
+
+          case KW_sound_die:
+            sound = sound_find (f.get_str ());
+            break;
+
           case KW_x: f.get (x); break;
           case KW_y: f.get (y); break;
 
@@ -960,23 +968,10 @@
 
           case KW_msg:
             f.get_ml (KW_endmsg, msg);
-            //TODO: allow longer messages
-            if (strlen (msg) >= HUGE_BUF)
-              {
-                LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
-                msg = "ERROR, please report: string too long, winged.\n";
-              }
             break;
 
           case KW_lore:
             f.get_ml (KW_endlore, lore);
-            //TODO: allow longer messages
-            /* Just print a warning so we can be reasonably safe
-             * about not overflowing the buffer.
-             */
-            if (strlen (lore) > (HUGE_BUF / 2))
-              LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
-                   HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
             break;
 
           case KW_editable:
@@ -1281,15 +1276,14 @@
   CMP_OUT (title);
   CMP_OUT (race);
   CMP_OUT (slaying);
-
-  if (op->msg != tmp->msg)
-    f.put (KW_msg, KW_endmsg, op->msg);
-  if (op->lore != tmp->lore)
-    f.put (KW_lore, KW_endlore, op->lore);
-
   CMP_OUT (other_arch);
 
-  if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
+  if (op->msg  != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
+  if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
+
+  if (op->face      != tmp->face     ) f.put (KW_face     , op->face      ? &faces [op->face     ] : 0);
+  if (op->sound     != tmp->sound    ) f.put (KW_sound    , op->sound     ? &faces [op->sound    ] : 0);
+  if (op->sound_die != tmp->sound_die) f.put (KW_sound_die, op->sound_die ? &faces [op->sound_die] : 0);
 
   if (op->animation_id != tmp->animation_id)
     if (op->animation_id)
@@ -1297,10 +1291,10 @@
         f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
 
         if (!QUERY_FLAG (op, FLAG_ANIMATE))
-          f.put (KW_is_animated, (sint32) 0);
+          f.put (KW_is_animated, (sint32)0);
       }
     else
-      f.put (KW_animation, (const char *) 0);
+      f.put (KW_animation, (const char *)0);
 
   CMP_OUT2 (str, stats.Str);
   CMP_OUT2 (dex, stats.Dex);