--- deliantra/server/common/anim.C	2007/11/08 19:43:23	1.28
+++ deliantra/server/common/anim.C	2009/09/17 01:57:31	1.31
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -32,7 +32,7 @@
 void
 animation::resize (int new_size)
 {
-  sfree <faceidx> (faces, num_animations);
+  sfree<faceidx> (faces, num_animations);
   num_animations = new_size;
   faces = salloc<faceidx> (num_animations);
 }
@@ -130,27 +130,15 @@
    * is facing.
    */
 
-  if (NUM_FACINGS (op) == 2)
-    {
-      if (dir < 5)
-        base_state = 0;
-      else
-        base_state = NUM_ANIMATIONS (op) / 2;
-    }
-  else if (NUM_FACINGS (op) == 4)
-    {
-      if (dir == 0)
-        base_state = 0;
-      else
-        base_state = ((dir - 1) / 2) * (NUM_ANIMATIONS (op) / 4);
-    }
-  else if (NUM_FACINGS (op) == 8)
-    {
-      if (dir == 0)
-        base_state = 0;
-      else
-        base_state = (dir - 1) * (NUM_ANIMATIONS (op) / 8);
-    }
+  if (dir > 0)
+    switch (NUM_FACINGS (op))
+      {
+        case 2: base_state = ((dir - 1) / (8 / 2)) * (NUM_ANIMATIONS (op) / 2); break;
+        case 4: base_state = ((dir - 1) / (8 / 4)) * (NUM_ANIMATIONS (op) / 4); break;
+        case 8: base_state = ((dir - 1) / (8 / 8)) * (NUM_ANIMATIONS (op) / 8); break;
+      }
+  else
+    base_state = 0;
 
   /* If beyond drawable states, reset */
   if (op->state >= max_state)