--- deliantra/server/common/living.C	2010/03/28 17:04:37	1.113
+++ deliantra/server/common/living.C	2010/03/28 18:44:21	1.114
@@ -1143,7 +1143,7 @@
   if (type != PLAYER)
     this->chosen_skill = chosen_skill;
 
-  glow_radius = min (glow_radius, MAX_LIGHT_RADIUS);
+  min_it (glow_radius, MAX_LIGHT_RADIUS);
 
   /* We've gone through all the objects the player has equipped.  For many things, we
    * have generated intermediate values which we now need to assign.
@@ -1160,7 +1160,7 @@
       resist[i] = prot[i] - vuln[i];
 
       if (potion_resist[i] != -1000
-          && (potion_resist[i] > resist[i] || potion_resist[i] < 0))
+          && (potion_resist[i] < 0 || potion_resist[i] > resist[i]))
         resist[i] = potion_resist[i];
     }