--- deliantra/server/common/living.C	2009/11/06 12:49:19	1.99
+++ deliantra/server/common/living.C	2009/11/11 04:45:22	1.102
@@ -597,7 +597,7 @@
   object *tmp;
   archetype *at;
 
-  at = archetype::find (ARCH_DEPLETION);
+  at = archetype::find (shstr_depletion);
   if (!at)
     {
       LOG (llevError, "Couldn't find archetype depletion.\n");
@@ -627,7 +627,7 @@
 void
 object::change_luck (int value)
 {
-  archetype *at = archetype::find ("luck");
+  archetype *at = archetype::find (shstr_luck);
   if (!at)
     LOG (llevError, "Couldn't find archetype luck.\n");
   else
@@ -769,6 +769,8 @@
   /* First task is to clear all the values back to their original values */
   if (type == PLAYER)
     {
+      contr->delayed_update = false;
+
       for (int i = 0; i < NUM_STATS; i++)
         stat_sum [i] = contr->orig_stats.stat (i);
 
@@ -1407,11 +1409,8 @@
   /* It is quite possible that a player's spell costing might have changed,
    * so we will check that now.
    */
-  if (type == PLAYER)
-    {
-      esrv_update_stats  (contr);
-      esrv_update_spells (contr);
-    }
+  if (is_player ())
+    contr->update_spells ();
 
   // update the mapspace, if we are on a map
   if (!flag [FLAG_REMOVED] && map)
@@ -1654,12 +1653,7 @@
     }
 
   if (changed)
-    {
-      who->update_stats ();
-      esrv_update_stats (who->contr);
-      /* check if the spell data has changed */
-      esrv_update_spells (who->contr);
-    }
+    who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
 }
 
 /*
@@ -1950,7 +1944,7 @@
     if (tmp->type == SKILL && tmp->stats.exp)
       {
         percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
-        level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)];
+        level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
 
         /* With the revised exp system, you can get cases where
          * losing several levels would still require that you have more