--- deliantra/server/common/living.C	2006/09/14 22:33:59	1.12
+++ deliantra/server/common/living.C	2006/12/20 10:31:00	1.18
@@ -160,11 +160,7 @@
 
 #define MAX_EXP_IN_OBJ levels[settings.max_level]/(MAX_EXP_CAT - 1)
 
-#ifndef WIN32
-extern uint64 *levels;
-#else
 extern sint64 *levels;
-#endif
 
 #define MAX_SAVE_LEVEL 110
 
@@ -657,7 +653,7 @@
         }
     }
 
-  if (tmp->type != EXPERIENCE && !potion_max)
+  if (!potion_max)
     {
       for (j = 0; j < NUM_STATS; j++)
         {
@@ -996,19 +992,21 @@
                * spell point recovery and mana point recovery.  Seems sort of an arbitary
                * list, but other items store other info into stats array. 
                */
-              if ((tmp->type == EXPERIENCE) || (tmp->type == WEAPON) ||
-                  (tmp->type == ARMOUR) || (tmp->type == HELMET) ||
-                  (tmp->type == SHIELD) || (tmp->type == RING) ||
-                  (tmp->type == BOOTS) || (tmp->type == GLOVES) ||
-                  (tmp->type == AMULET) || (tmp->type == GIRDLE) ||
-                  (tmp->type == BRACERS) || (tmp->type == CLOAK) || (tmp->type == DISEASE) || (tmp->type == FORCE) || (tmp->type == SKILL))
+              if ((tmp->type == WEAPON)  ||
+                  (tmp->type == ARMOUR)  || (tmp->type == HELMET) ||
+                  (tmp->type == SHIELD)  || (tmp->type == RING)   ||
+                  (tmp->type == BOOTS)   || (tmp->type == GLOVES) ||
+                  (tmp->type == AMULET)  || (tmp->type == GIRDLE) ||
+                  (tmp->type == BRACERS) || (tmp->type == CLOAK)  ||
+                  (tmp->type == DISEASE) || (tmp->type == FORCE)  ||
+                  (tmp->type == SKILL))
                 {
-                  op->contr->digestion += tmp->stats.food;
-                  op->contr->gen_hp += tmp->stats.hp;
-                  op->contr->gen_sp += tmp->stats.sp;
-                  op->contr->gen_grace += tmp->stats.grace;
+                  op->contr->digestion     += tmp->stats.food;
+                  op->contr->gen_hp        += tmp->stats.hp;
+                  op->contr->gen_sp        += tmp->stats.sp;
+                  op->contr->gen_grace     += tmp->stats.grace;
                   op->contr->gen_sp_armour += tmp->gen_sp_armour;
-                  op->contr->item_power += tmp->item_power;
+                  op->contr->item_power    += tmp->item_power;
                 }
             }                   /* if this is a player */
 
@@ -1961,11 +1959,7 @@
 {
 
 #ifdef EXP_DEBUG
-# ifndef WIN32
-  LOG (llevDebug, "change_exp() called for %s, exp = %lld\n", query_name (op), exp);
-# else
-  LOG (llevDebug, "change_exp() called for %s, exp = %I64d\n", query_name (op), exp);
-# endif
+  LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
 #endif
 
   /* safety */