--- deliantra/server/common/living.C	2007/02/05 03:01:32	1.34
+++ deliantra/server/common/living.C	2007/04/29 03:44:35	1.37
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -820,12 +820,10 @@
  * and players; the "player" in the name is purely an archaic inheritance.
  * This functions starts from base values (archetype or player object)
  * and then adjusts them according to what the player has equipped.
+ *
+ * July 95 - inserted stuff to handle new skills/exp system - b.t.
+ * spell system split, grace points now added to system  --peterm
  */
-
-/* July 95 - inserted stuff to handle new skills/exp system - b.t.
-   spell system split, grace points now added to system  --peterm
- */
-
 void
 object::update_stats ()
 {
@@ -859,9 +857,9 @@
        * range_magic (what spell is readied).  These three below
        * well get filled in based on what the player has equipped.
        */
-      contr->ranges[range_bow] = NULL;
-      contr->ranges[range_misc] = NULL;
-      contr->ranges[range_skill] = NULL;
+      contr->ranges[range_bow]   = 0;
+      contr->ranges[range_misc]  = 0;
+      contr->ranges[range_skill] = 0;
     }
 
   memcpy (body_used, body_info, sizeof (body_info));
@@ -1154,23 +1152,24 @@
               case GLOVES:
               case CLOAK:
                 if (tmp->stats.wc)
-                  wc -= (tmp->stats.wc + tmp->magic);
+                  wc -= tmp->stats.wc + tmp->magic;
 
                 if (tmp->stats.dam)
-                  stats.dam += (tmp->stats.dam + tmp->magic);
+                  stats.dam += tmp->stats.dam + tmp->magic;
 
                 if (tmp->stats.ac)
-                  ac -= (tmp->stats.ac + tmp->magic);
+                  ac -= tmp->stats.ac + tmp->magic;
 
                 break;
 
+              case BOW:
               case WEAPON:
-                wc -= (tmp->stats.wc + tmp->magic);
+                wc -= tmp->stats.wc + tmp->magic;
 
                 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
                   ac -= tmp->stats.ac + tmp->magic;
 
-                stats.dam += (tmp->stats.dam + tmp->magic);
+                stats.dam += tmp->stats.dam + tmp->magic;
                 weapon_weight = tmp->weight;
                 weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
 
@@ -1390,19 +1389,21 @@
 
       if (type == PLAYER && wc_obj && wc_obj->level > 1)
         {
-          wc -= (wc_obj->level + thaco_bonus[stats.Str]);
+          wc -= wc_obj->level + thaco_bonus[stats.Str];
+
           for (i = 1; i < wc_obj->level; i++)
             {
               /* addtional wc every 6 levels */
               if (!(i % 6))
                 wc--;
+
               /* addtional dam every 4 levels. */
-              if (!(i % 4) && (dam_bonus[stats.Str] >= 0))
-                stats.dam += (1 + (dam_bonus[stats.Str] / 5));
+              if (!(i % 4) && dam_bonus[stats.Str] >= 0)
+                stats.dam += 1 + dam_bonus[stats.Str] / 5;
             }
         }
       else
-        wc -= (level + thaco_bonus[stats.Str]);
+        wc -= level + thaco_bonus[stats.Str];
 
       stats.dam += dam_bonus[stats.Str];
 
@@ -1516,6 +1517,10 @@
       esrv_update_stats  (contr);
       esrv_update_spells (contr);
     }
+
+  // update the mapspace, if we are on a map
+  if (!flag [FLAG_REMOVED] && map)
+    map->at (x, y).flags_ = 0;
 }
 
 /*
@@ -1952,6 +1957,7 @@
             player_lvl_adj (op, tmp);
           }
       }
+
   if (flag != SK_SUBTRACT_SKILL_EXP)
     {
       del_exp = check_exp_loss (op, exp);
@@ -1960,8 +1966,6 @@
     }
 }
 
-
-
 /* change_exp() - changes experience to a player/monster.  This
  * does bounds checking to make sure we don't overflow the max exp.
  *
@@ -1971,11 +1975,9 @@
  * flag is what to do if player doesn't have the skill.
  * these last two values are only used for players.
  */
-
 void
 change_exp (object *op, sint64 exp, const char *skill_name, int flag)
 {
-
 #ifdef EXP_DEBUG
   LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
 #endif
@@ -2034,7 +2036,6 @@
  * settings death_penalty_percentage and death_penalty_levels, and by the
  * amount of permenent experience, whichever gives the lowest loss.
  */
-
 void
 apply_death_exp_penalty (object *op)
 {