--- deliantra/server/common/los.C	2007/02/16 21:38:18	1.22
+++ deliantra/server/common/los.C	2007/05/17 21:32:08	1.25
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -43,7 +43,11 @@
   int index;
 } blocks;
 
-blocks block[(MAP_CLIENT_X | 1) + 1][(MAP_CLIENT_Y | 1) + 1]; // still a speed hack
+// 31/32 == a speed hack
+// we would like to use 32 for speed, but the code loops endlessly
+// then, reason not yet identified, so only make the array use 32,
+// not the define's.
+blocks block[MAP_CLIENT_X][MAP_CLIENT_Y == 31 ? 32 : MAP_CLIENT_Y];
 
 static void expand_lighted_sight (object *op);
 
@@ -92,15 +96,12 @@
 init_block (void)
 {
   int x, y, dx, dy, i;
-  static int block_x[3] = { -1, -1, 0 }, block_y[3] =
-  {
-  -1, 0, -1};
+  static int block_x[3] = { -1, -1, 0 },
+             block_y[3] = { -1, 0, -1 }; 
 
   for (x = 0; x < MAP_CLIENT_X; x++)
     for (y = 0; y < MAP_CLIENT_Y; y++)
-      {
-        block[x][y].index = 0;
-      }
+      block[x][y].index = 0;
 
 
   /* The table should be symmetric, so only do the upper left
@@ -127,13 +128,9 @@
                    */
                   set_block (x, y, dx, dy);
                   if (x == MAP_CLIENT_X / 2)
-                    {
-                      set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);
-                    }
+                    set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);
                   else if (y == MAP_CLIENT_Y / 2)
-                    {
-                      set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
-                    }
+                    set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
                 }
               else
                 {
@@ -177,7 +174,6 @@
  * spaces behind it may block other spaces, etc.  
  * In this way, the chain of visibility is set.
  */
-
 static void
 set_wall (object *op, int x, int y)
 {