--- deliantra/server/common/living.C	2010/04/11 00:34:05	1.118
+++ deliantra/server/common/living.C	2012/01/03 11:25:31	1.126
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  * 
@@ -141,7 +141,7 @@
    Both come in handy at least in function add_exp()
 */
 
-#define MAX_EXPERIENCE  levels[settings.max_level]
+#define MAX_EXPERIENCE  levels [settings.max_level]
 
 /* because exp_obj sum to make the total score,
  * we cannot allow that sum to exceed the maximum
@@ -158,9 +158,7 @@
  *  -b.t.
  */
 
-#define MAX_EXP_IN_OBJ levels[settings.max_level]/(MAX_EXP_CAT - 1)
-
-extern sint64 *levels;
+#define MAX_EXP_IN_OBJ MAX_EXP_IN_OBJ / (MAX_EXP_CAT - 1)
 
 #define MAX_SAVE_LEVEL 110
 
@@ -874,7 +872,8 @@
        */
       if ((tmp->flag [FLAG_APPLIED]
            && tmp->type != CONTAINER
-           && tmp->type != CLOSE_CON)
+           && tmp->type != CLOSE_CON
+           && tmp->type != SPELL)
           || (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
         {
           if (type == PLAYER)
@@ -919,9 +918,9 @@
           else if (tmp->type != POTION)
             for (int i = 0; i < NROFATTACKS; i++)
               if (tmp->resist[i] > 0)
-                prot[i] += ((100 - prot[i]) *  tmp->resist[i]) / 100;
+                prot[i] += (100 - prot[i]) *  tmp->resist[i] / 100;
               else if (tmp->resist[i] < 0)
-                vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
+                vuln[i] += (100 - vuln[i]) * -tmp->resist[i] / 100;
 
           /* There may be other things that should not adjust the attacktype */
           if (tmp->type != SYMPTOM)
@@ -942,7 +941,7 @@
           //TODO: copy_flags?
           if (tmp->flag [FLAG_MAKE_INVIS])
             {
-              this->set_flag (FLAG_MAKE_INVIS);
+              set_flag (FLAG_MAKE_INVIS);
               invisible = 1;
             }
 
@@ -1026,11 +1025,7 @@
 
                 break;
 
-              case WAND:
-              case ROD:
-              case HORN:
-                break;
-
+              case RANGED:
               case BOW:
               case WEAPON:
                 wc -= tmp->stats.wc + tmp->magic;
@@ -1093,7 +1088,7 @@
                   ac -= tmp->stats.ac + tmp->magic;
 
                 if (ARMOUR_SPEED (tmp))
-                  max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
+                  min_it (max_speed, ARMOUR_SPEED (tmp) / 10.f);
 
                 break;
             }                   /* switch tmp->type */
@@ -1614,10 +1609,7 @@
 sint64
 level_exp (int level, double expmul)
 {
-  if (level > settings.max_level)
-    return (sint64) (expmul * levels[settings.max_level]);
-
-  return (sint64) (expmul * levels[level]);
+  return expmul * level_to_min_exp (level);
 }
 
 /*
@@ -1655,7 +1647,7 @@
  * flag is what to do if the player doesn't have the skill:
  */
 static void
-add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
+add_player_exp (object *op, sint64 exp, shstr_tmp skill_name, int flag)
 {
   object *skill_obj;
   sint64 limit, exp_to_add;
@@ -1695,7 +1687,7 @@
        * than half what you need to gain for next level.
        */
       exp_to_add = exp;
-      limit = (levels[op->level + 1] - levels[op->level]) / 2;
+      limit = (levels [op->level + 1] - levels [op->level]) / 2;
       if (exp_to_add > limit)
         exp_to_add = limit;
 
@@ -1712,7 +1704,7 @@
   if (skill_obj)
     {
       exp_to_add = exp;
-      limit = (levels[skill_obj->level + 1] - levels[skill_obj->level]) / 2;
+      limit = (levels [skill_obj->level + 1] - levels [skill_obj->level]) / 2;
       if (exp_to_add > limit)
         exp_to_add = limit;
 
@@ -1779,7 +1771,7 @@
  * a postive number.
  */
 static void
-subtract_player_exp (object *op, sint64 exp, const char *skill, int flag)
+subtract_player_exp (object *op, sint64 exp, shstr_tmp skill, int flag)
 {
   float fraction = (float) exp / (float) op->stats.exp;
   object *tmp;
@@ -1788,7 +1780,7 @@
   for (tmp = op->inv; tmp; tmp = tmp->below)
     if (tmp->type == SKILL && tmp->stats.exp)
       {
-        if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
+        if (flag == SK_SUBTRACT_SKILL_EXP && skill && tmp->skill == skill)
           {
             del_exp = check_exp_loss (tmp, exp);
             tmp->stats.exp -= del_exp;
@@ -1799,7 +1791,7 @@
             /* only want to process other skills if we are not trying
              * to match a specific skill.
              */
-            del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction));
+            del_exp = check_exp_loss (tmp, tmp->stats.exp * fraction);
             tmp->stats.exp -= del_exp;
             player_lvl_adj (op, tmp);
           }
@@ -1823,7 +1815,7 @@
  * these last two values are only used for players.
  */
 void
-change_exp (object *op, sint64 exp, const char *skill_name, int flag)
+change_exp (object *op, sint64 exp, shstr_tmp skill_name, int flag)
 {
 #ifdef EXP_DEBUG
   LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
@@ -1911,7 +1903,7 @@
       }
 
   percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
-  level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
+  level_loss = op->stats.exp - levels [max (0, op->level - settings.death_penalty_level)];
 
   if (level_loss < 0)
     level_loss = 0;