--- deliantra/server/common/loader.C	2009/11/09 17:39:05	1.142
+++ deliantra/server/common/loader.C	2009/11/11 23:27:56	1.148
@@ -332,8 +332,8 @@
     name_pl = name;
 
   /* objects now have a materialname.  try to patch it in */
-  if (!(is_weapon () && level > 0))
-    set_materialname (this, map ? map->difficulty : 5, 0);
+  if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
+    select_material (this, map ? map->difficulty : 5);
 
   /* only do these when program is first run - a bit
    * excessive to do this at every run - most of this is
@@ -727,7 +727,14 @@
           case KW_state:                f.get (state); break;
           case KW_move_slow_penalty:    f.get (move_slow_penalty); break;
           case KW_material:             f.get (materials); break; //TODO: nuke
-          case KW_materialname:         f.get (materialname); break;
+
+          case KW_materialname:
+            {
+              shstr sh;
+              f.get (sh);
+              material = name_to_material (sh);
+            }
+            break;
 
             /* These are the new values */
           case KW_move_block:           set_move (move_block, f.get_str ()); break;
@@ -854,7 +861,6 @@
           case KW_no_magic:             GET_FLAG (this, FLAG_NO_MAGIC); break;
           case KW_no_drop:              GET_FLAG (this, FLAG_NO_DROP); break;
           case KW_random_movement:      GET_FLAG (this, FLAG_RANDOM_MOVE); break;
-          case KW_no_fix_player:        GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
           case KW_is_lightable:         GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
           case KW_tear_down:            GET_FLAG (this, FLAG_TEAR_DOWN); break;
           case KW_can_use_shield:       GET_FLAG (this, FLAG_USE_SHIELD); break;
@@ -1134,8 +1140,8 @@
     KW_can_use_shield,
     KW_no_pick,
     KW_NULL, // walk_on
-    KW_NULL, // no_pass
     /* 10 */
+    KW_NULL, // no_pass
     KW_is_animated,
     KW_NULL, // slow_move
     KW_NULL, // flying
@@ -1145,8 +1151,8 @@
     KW_is_thrown,
     KW_auto_apply,
     KW_treasure_env,
-    KW_player_sold,
     /* 20 */
+    KW_player_sold,
     KW_see_invisible,
     KW_can_roll,
     KW_overlay_floor,
@@ -1156,8 +1162,8 @@
     KW_NULL, // fly_off
     KW_is_used_up,
     KW_identified,
-    KW_reflecting,
     /* 30 */
+    KW_reflecting,
     KW_changing,
     KW_splitting,
     KW_hitback,
@@ -1167,10 +1173,10 @@
     KW_scared,
     KW_unaggressive,
     KW_reflect_missile,
-    KW_reflect_spell,
     /* 40 */
+    KW_reflect_spell,
     KW_no_magic,
-    KW_no_fix_player,
+    KW_NULL,
     KW_is_lightable,
     KW_tear_down,
     KW_run_away,
@@ -1178,8 +1184,8 @@
     KW_NULL, // an_pass_thru
     KW_pick_up,
     KW_unique,
-    KW_no_drop,
     /* 50 */
+    KW_no_drop,
     KW_NULL, // wizcast
     KW_can_cast_spell,
     KW_can_use_scroll,
@@ -1189,8 +1195,8 @@
     KW_can_use_weapon,
     KW_can_use_ring,
     KW_has_ready_range,
-    KW_has_ready_bow,
     /* 60 */
+    KW_has_ready_bow,
     KW_xrays,
     KW_NULL,
     KW_is_floor,
@@ -1200,8 +1206,8 @@
     KW_stand_still,
     KW_random_move,
     KW_only_attack,
-    KW_confused,
     /* 70 */
+    KW_confused,
     KW_stealth,
     KW_NULL,
     KW_NULL,
@@ -1211,8 +1217,8 @@
     KW_known_magical,
     KW_known_cursed,
     KW_can_use_skill,
-    KW_been_applied,
     /* 80 */
+    KW_been_applied,
     KW_has_ready_scroll,
     KW_can_use_rod,
     KW_precious,
@@ -1222,8 +1228,8 @@
     KW_is_wooded,
     KW_is_hilly,
     KW_has_ready_skill,
-    KW_has_ready_weapon,
     /* 90 */
+    KW_has_ready_weapon,
     KW_no_skill_ident,
     KW_is_blind,
     KW_can_see_in_dark,
@@ -1233,8 +1239,8 @@
     KW_one_hit,
     KW_NULL,
     KW_berserk,
-    KW_neutral,
     /* 100 */
+    KW_neutral,
     KW_no_attack,
     KW_no_damage,
     KW_obj_original,
@@ -1244,12 +1250,24 @@
     KW_is_water,
     KW_use_content_on_gen,
     KW_NULL,
-    KW_is_buildable,
     /* 110 */
+    KW_is_buildable,
     KW_destroy_on_death,
     KW_NULL,
   };
 
+  // obj_original is the only commonly differing flag between archetype
+  // and object, so special-case it here to be able to skip the loop
+  static const struct flagmask : object::flags_t
+  {
+    flagmask ()
+    {
+      for (int i = 0; i < NUM_FLAGS; i++)
+        if (flag_names [i])
+          set (i);
+    }
+  } flagmask;
+
   /* This saves the key/value lists.  We do it first so that any
    * keys that match field names will be overwritten by the loader.
    */
@@ -1271,8 +1289,8 @@
       f.alloc (ptr - cur);
     }
 
-#define CMP_OUT(v)    if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v)
-#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
+#define CMP_OUT(v)    if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
+#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
 
   CMP_OUT (x);
   CMP_OUT (y);
@@ -1285,7 +1303,24 @@
   CMP_OUT (name_pl);
 
   CMP_OUT (speed);
-  CMP_OUT (speed_left);
+
+  // speed_left is a major time-burner, and has good locality, so
+  // we use a simple lookup-cache to avoid the very slow printf.
+  if (op->speed_left != arch->speed_left)
+    {
+      static double last_speed_left = 0.;
+      static char   last_speed_left_str [256] = "speed_left 0\n";
+      static int    last_speed_left_len = sizeof ("speed_left 0\n") - 1;
+
+      if (last_speed_left != op->speed_left)
+        {
+          last_speed_left = op->speed_left;
+          last_speed_left_len = sizeof ("speed_left ") - 1
+                              + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left);
+        }
+
+      f.add (last_speed_left_str, last_speed_left_len);
+    }
 
   CMP_OUT (title);
   CMP_OUT (race);
@@ -1296,25 +1331,25 @@
   CMP_OUT (custom_name);
 
   if (object *owner = op->owner)
-    f.put (KW_owner, static_cast<const char *>(owner->ref ()));
+    f.put (KW(owner), static_cast<const char *>(owner->ref ()));
 
   // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
 
   CMP_OUT (other_arch);
 
-  if (op->msg  != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
-  if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
+  if (op->msg  != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
+  if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
 
-  if (op->face          != arch->face         ) f.put (KW_face         , op->face          ? &faces [op->face         ] : 0);
-  if (op->sound         != arch->sound        ) f.put (KW_sound        , op->sound         ? &faces [op->sound        ] : 0);
-  if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
+  if (op->face          != arch->face         ) f.put (KW(face)         , op->face          ? &faces [op->face         ] : 0);
+  if (op->sound         != arch->sound        ) f.put (KW(sound)        , op->sound         ? &faces [op->sound        ] : 0);
+  if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
 
   if (op->animation_id != arch->animation_id)
     if (op->has_anim ())
-      f.put (KW_animation, op->anim ().name);
+      f.put (KW(animation), op->anim ().name);
     else
       {
-        f.put (KW_animation, (const char *)0);
+        f.put (KW(animation));
         op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
       }
 
@@ -1349,7 +1384,7 @@
   CMP_OUT (level);
   CMP_OUT (attacktype);
 
-  // using memcmp here seems to be a loss - us gcc vectorising?
+  // using memcmp here seems to be a loss - is gcc vectorising?
   for (int i = 0; i < NROFATTACKS; i++)
     if (expect_false (op->resist[i] != arch->resist[i]))
       f.put (resist_save[i], op->resist[i]);
@@ -1357,8 +1392,11 @@
   CMP_OUT (path_attuned);
   CMP_OUT (path_repelled);
   CMP_OUT (path_denied);
+
   CMP_OUT2 (material, materials);//TODO: nuke
-  CMP_OUT (materialname);
+  if (op->material != arch->material)
+    f.put (KW(materialname), op->material->name);
+
   CMP_OUT (value);
   CMP_OUT (carrying);
   CMP_OUT (weight);
@@ -1373,7 +1411,7 @@
 
   if (op->flag [FLAG_IS_LINKED])
     if (auto (ol, op->find_link ()))
-      f.put (KW_connected, ol->id);
+      f.put (KW(connected), ol->id);
 
   CMP_OUT (randomitems);
   CMP_OUT2 (container, weight_limit);
@@ -1400,25 +1438,18 @@
   CMP_OUT (move_slow);
   CMP_OUT (move_slow_penalty);
 
-  // obj_original is the only commonly differing flag between archetype
-  // and object, so special-case it here to be able to skip the loop
-  object::flags_t diff = op->flag ^ arch->flag;
+  object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
+
+  if (diff [FLAG_OBJ_ORIGINAL])
+    f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
+
+  diff.reset (FLAG_OBJ_ORIGINAL);
 
+  // quickly test whether any other flags differ
   if (expect_true (diff.any ()))
-    {
-      if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()) || 1)
-        {
-          // some other flags differ, too
-          for (int i = 0; i < NUM_FLAGS; i++)
-            if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i]))
-              f.put (flag_names [i], op->flag [i] ? "1" : "0");
-        }
-      else
-        {
-          // only obj_original differs
-          f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
-        }
-    }
+    for (int i = 0; i < NUM_FLAGS; i++)
+      if (expect_false (diff [i]))
+        f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
 
   // save body locations. gcc's memcmp does an abysmal job when used
   for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
@@ -1434,14 +1465,14 @@
 bool
 object::write (object_freezer &f)
 {
-  if (is_arch ())
+  if (expect_false (is_arch ()))
     {
-      f.put (KW_object, arch->archname);
+      f.put (KW(object), arch->archname);
       write_diff (f, this, archetype::empty);
     }
   else
     {
-      f.put (KW_arch, arch->archname);
+      f.put (KW(arch), arch->archname);
       write_diff (f, this, arch);
     }
 
@@ -1449,7 +1480,7 @@
     tmp->write (f);
 
   f.put (this);
-  f.put (KW_end);
+  f.put (KW(end));
 
   return true;
 }