--- deliantra/server/common/living.C	2007/05/12 19:41:02	1.55
+++ deliantra/server/common/living.C	2007/05/13 15:13:57	1.56
@@ -1362,13 +1362,13 @@
       float M = (max_carry[stats.Str] - 121) / 121.f;
       float M2 = max_carry[stats.Str] / 100.f;
       float W = weapon_weight / 20000.f;
-      float s = 2 - weapon_speed / 10.f;
+      float s = (20 - weapon_speed) / 10.f;
       float D = (stats.Dex - 14) / 14.f;
       float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
 
-      K *= (4 + level) *1.2f / (6 + level);
+      K *= (4 + level) * 1.2f / (6 + level);
 
-      if (K <= 0.f)
+      if (K <= 0.01f)
         K = 0.01f;
 
       float S = speed / (K * s);
@@ -1380,23 +1380,8 @@
   if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3)
     stats.dam = arch->clone.stats.dam * 3;
 
-  /* Prevent overflows of wc - best you can get is ABS(120) - this
-   * should be more than enough - remember, AC is also in 8 bits,
-   * so its value is the same.
-   */
-  if (wc > 120)
-    wc = 120;
-  else if (wc < -120)
-    wc = -120;
-
-  stats.wc = wc;
-
-  if (ac > 120)
-    ac = 120;
-  else if (ac < -120)
-    ac = -120;
-
-  stats.ac = ac;
+  stats.wc = clamp (wc, MIN_WC, MAX_WC);
+  stats.ac = clamp (ac, MIN_AC, MAX_AC);
 
   /* if for some reason the creature doesn't have any move type,
    * give them walking as a default.