--- deliantra/server/common/living.C	2010/04/11 00:34:05	1.118
+++ deliantra/server/common/living.C	2010/04/15 04:56:46	1.119
@@ -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
 
@@ -1614,10 +1612,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);
 }
 
 /*
@@ -1695,7 +1690,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 +1707,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;