*** dbsaver.c	Mon Feb 13 02:52:00 1995
--- mudlib/obj/dbsaver.c	Sat Feb 18 23:18:42 1995
***************
*** 48,55 ****
  }
  
  private
! void write_propdef(mixed *prop)
! { write_string(prop[PROP_CNAME]); }
  
  private
  void write_var(MOOVAL var)
--- 48,60 ----
  }
  
  private
! void write_propdef(string name, mixed *prop)
! {
!   string str;
! 
!   str = prop[PROP_CNAME];
!   write_string(str ? str : name);
! }
  
  private
  void write_var(MOOVAL var)
***************
*** 133,138 ****
--- 138,144 ----
  {
    object ob, parent, location, *children, *contents;
    int i, sz, count;
+   string *propnames;
    mixed *verbs, *propvals;
    mapping properties;
  
***************
*** 189,202 ****
      write_verbdef(verbs[i]);
  
    properties = ob->get_property_data();
!   propvals = map_values(properties);
    for (count = 0, i = 0, sz = sizeof(propvals); i < sz; ++i)
      if (! INHERITED(propvals[i]))
        ++count;
    write_num(count);		/* propdefs */
    for (i = 0; i < sz; ++i)
      if (! INHERITED(propvals[i]))
!       write_propdef(propvals[i]);
  
    count = sz;
    write_num(count);		/* propvals */
--- 195,210 ----
      write_verbdef(verbs[i]);
  
    properties = ob->get_property_data();
!   propnames  = map_indices(properties);
!   propvals   = map_values(properties);
! 
    for (count = 0, i = 0, sz = sizeof(propvals); i < sz; ++i)
      if (! INHERITED(propvals[i]))
        ++count;
    write_num(count);		/* propdefs */
    for (i = 0; i < sz; ++i)
      if (! INHERITED(propvals[i]))
!       write_propdef(propnames[i], propvals[i]);
  
    count = sz;
    write_num(count);		/* propvals */