--- deliantra/server/common/loader.C 2007/07/10 05:51:37 1.92 +++ deliantra/server/common/loader.C 2007/07/31 17:33:14 1.93 @@ -639,6 +639,12 @@ face = face_find (f.get_str ()); break; + case KW_sound: + sound = sound_find (f.get_str ()); + if (!sound) + sound = face_find (f.get_str ());//TODO: really fall back to face name? + break; + case KW_x: f.get (x); break; case KW_y: f.get (y); break; @@ -1268,15 +1274,13 @@ 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->sound != tmp->sound) f.put (KW_sound, op->sound ? &faces [op->sound] : 0); + if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); if (op->animation_id != tmp->animation_id) if (op->animation_id)