[ViewVC] Diff of: cvs/deliantra/server/common/los.C

Comparing deliantra/server/common/los.C (file contents):
Revision 1.19 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.30 by root, Mon Apr 21 23:35:24 2008 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
 #include <global.h>
-#include <funcpoint.h>
 #include <math.h>
 /* Distance must be less than this for the object to be blocked.
  * An object is 1.0 wide, so if set to 0.5, it means the object
  * that blocks half the view (0.0 is complete block) will
 {
   int x[4], y[4];
   int index;
 } blocks;
+// 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];
+blocks block[MAP_CLIENT_X][MAP_CLIENT_Y == 31 ? 32 : MAP_CLIENT_Y];
 static void expand_lighted_sight (object *op);
 /*
  * Used to initialise the array used by the LOS routines.
 void
 init_block (void)
 {
   int x, y, dx, dy, i;
-  static int block_x[3] = { -1, -1, 0 }, block_y[3] =
+  static int block_x[3] = { -1, -1, 0 },
-  {
+             block_y[3] = { -1, 0, -1 };
-  -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
    * quadrant - makes the processing easier.
    */
                   /* For simplicity, we mirror the coordinates to block the other
                    * quadrants.
                    */
                   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
                 {
                   float d1, r, s, l;
  * that if some particular space is blocked, it blocks
  * the view of the spaces 'behind' it, and those blocked
  * 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)
 {
   int i;
  * Clears/initialises the los-array associated to the player
  * controlling the object.
  */
 void
-clear_los (object *op)
+clear_los (player *pl)
 {
   /* This is safer than using the ns->mapx, mapy because
    * we index the blocked_los as a 2 way array, so clearing
    * the first z spaces may not not cover the spaces we are
    * actually going to use
    */
-  (void) memset ((void *) op->contr->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y);
+  memset (pl->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y);
 }
 /*
  * expand_sight goes through the array of what the given player is
  * able to see, and expands the visible area a bit, so the player will,
       }
   if (op->map->darkness > 0)       /* player is on a dark map */
     expand_lighted_sight (op);
   /* clear mark squares */
   for (x = 0; x < op->contr->ns->mapx; x++)
     for (y = 0; y < op->contr->ns->mapy; y++)
       if (op->contr->blocked_los[x][y] < 0)
         op->contr->blocked_los[x][y] = 0;
 }
 /* returns true if op carries one or more lights
  * This is a trivial function now days, but it used to
  * be a bit longer.  Probably better for callers to just
  * check the op->glow_radius instead of calling this.
 /*
  * update_los() recalculates the array which specifies what is
  * visible for the given player-object.
  */
 void
 update_los (object *op)
 {
   int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y;
   if (QUERY_FLAG (op, FLAG_REMOVED))
     return;
-  clear_los (op);
+  clear_los (op->contr);
   if (QUERY_FLAG (op, FLAG_WIZ) /* ||XRAYS(op) */ )
     return;
   /* For larger maps, this is more efficient than the old way which
    * used the chaining of the block array.  Since many space views could
    * could be examined multile times, as each path would be looked at.
    */
   for (x = (MAP_CLIENT_X - op->contr->ns->mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->ns->mapx) / 2 + 1; x++)
     for (y = (MAP_CLIENT_Y - op->contr->ns->mapy) / 2 - 1; y < (MAP_CLIENT_Y + op->contr->ns->mapy) / 2 + 1; y++)
       check_wall (op, x, y);
   /* do the los of the player. 3 (potential) cases */
   if (QUERY_FLAG (op, FLAG_BLIND))      /* player is blind */
     blinded_sight (op);
   else
     expand_sight (op);
+  //TODO: no range-checking whatsoever :(
   if (QUERY_FLAG (op, FLAG_XRAYS))
-    {
-      int x, y;
-      for (x = -2; x <= 2; x++)
+    for (int x = -2; x <= 2; x++)
-        for (y = -2; y <= 2; y++)
+      for (int y = -2; y <= 2; y++)
-          op->contr->blocked_los[dx + x][dy + y] = 0;
+        op->contr->blocked_los[dx + x][dy + y] = 0;
-    }
 }
 /* update all_map_los is like update_all_los below,
  * but updates everyone on the map, no matter where they
  * are. This generally should not be used, as a per

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/los.C (file contents): Revision 1.19 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs. Revision 1.30 by root, Mon Apr 21 23:35:24 2008 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.19 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.30 by root, Mon Apr 21 23:35:24 2008 UTC