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

Comparing deliantra/server/common/los.C (file contents):
Revision 1.24 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.31 by root, Thu Dec 4 01:07:35 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
  * block view in our tables.
  * .4 or less lets you see through walls.  .5 is about right.
  */
 #define SPACE_BLOCK	0.5
+#define MAX_UNLIGHTED_VISION 4
 typedef struct blstr
 {
   int x[4], y[4];
   int index;
  * 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,
   /* First, limit player furthest (unlighted) vision */
   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] != 100)
-        op->contr->blocked_los[x][y] = MAX_LIGHT_RADII;
+        op->contr->blocked_los[x][y] = MAX_UNLIGHTED_VISION;
   /* the spaces[] darkness value contains the information we need.
    * Only process the area of interest.
    * the basex, basey values represent the position in the op->contr->blocked_los
    * array.  Its easier to just increment them here (and start with the right
    * value) than to recalculate them down below.
    */
-  for (x = (op->x - op->contr->ns->mapx / 2 - MAX_LIGHT_RADII), basex = -MAX_LIGHT_RADII;
+  for (x = (op->x - op->contr->ns->mapx / 2 - MAX_LIGHT_RADIUS), basex = -MAX_LIGHT_RADIUS;
-       x <= (op->x + op->contr->ns->mapx / 2 + MAX_LIGHT_RADII); x++, basex++)
+       x <= (op->x + op->contr->ns->mapx / 2 + MAX_LIGHT_RADIUS); x++, basex++)
     {
-      for (y = (op->y - op->contr->ns->mapy / 2 - MAX_LIGHT_RADII), basey = -MAX_LIGHT_RADII;
+      for (y = (op->y - op->contr->ns->mapy / 2 - MAX_LIGHT_RADIUS), basey = -MAX_LIGHT_RADIUS;
-           y <= (op->y + op->contr->ns->mapy / 2 + MAX_LIGHT_RADII); y++, basey++)
+           y <= (op->y + op->contr->ns->mapy / 2 + MAX_LIGHT_RADIUS); y++, basey++)
         {
           m = op->map;
           nx = x;
           ny = y;
           /* This space is providing light, so we need to brighten up the
            * spaces around here.
            */
           light = GET_MAP_LIGHT (m, nx, ny);
-          if (light != 0)
+          if (light)
             {
 #if 0
               LOG (llevDebug, "expand_lighted_sight: Found light at x=%d, y=%d, basex=%d, basey=%d\n", x, y, basex, basey);
 #endif
               for (ax = basex - light; ax <= basex + light; ax++)
                 {
                   if (ax < 0 || ax >= op->contr->ns->mapx)
                     continue;
+                  x1 = (basex - ax) * (basex - ax);
                   for (ay = basey - light; ay <= basey + light; ay++)
                     {
                       if (ay < 0 || ay >= op->contr->ns->mapy)
                         continue;
                       /* If the space is fully blocked, do nothing.  Otherwise, we
                        * brighten the space.  The further the light is away from the
                        * source (basex-x), the less effect it has.  Though light used
-                       * to dim in a square manner, it now dims in a circular manner
+                       * to dim in a square manner, it now dims in a roughly circular
-                       * using the the pythagorean theorem. glow_radius still
-                       * represents the radius
+                       * manner. glow_radius still represents the radius.
                        */
                       if (op->contr->blocked_los[ax][ay] != 100)
                         {
-                          x1 = abs (basex - ax) * abs (basex - ax);
-                          y1 = abs (basey - ay) * abs (basey - ay);
+                          y1 = (basey - ay) * (basey - ay);
-                          if (light > 0) op->contr->blocked_los[ax][ay] -= max (light - isqrt (x1 + y1), 0);
+                          op->contr->blocked_los[ax][ay] -= light > 0
-                          if (light < 0) op->contr->blocked_los[ax][ay] -= min (light + isqrt (x1 + y1), 0);
+                            ? max (light - isqrt (x1 + y1), 0)
+                            : min (light + isqrt (x1 + y1), 0);
                         }
                     }
                 }
             }
         }
     }
   /* Outdoor should never really be completely pitch black dark like
    * a dungeon, so let the player at least see a little around themselves
    */
-  if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3))
+  if (op->map->outdoor && darklevel > MAX_DARKNESS - 3)
     {
       if (op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] > (MAX_DARKNESS - 3))
         op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = MAX_DARKNESS - 3;
       for (x = -1; x <= 1; x++)
       if (!(op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] == 100))
         op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] -=
           MAX (0, 6 - darklevel - MAX (abs (x), abs (y)));
 }
-/* blinded_sight() - sets all veiwable squares to blocked except
+/* blinded_sight() - sets all viewable squares to blocked except
  * for the one the central one that the player occupies.  A little
  * odd that you can see yourself (and what your standing on), but
  * really need for any reasonable game play.
  */
 static void
 /*
  * 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

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.24 by root, Sun Mar 11 02:12:44 2007 UTC vs. Revision 1.31 by root, Thu Dec 4 01:07:35 2008 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.24 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.31 by root, Thu Dec 4 01:07:35 2008 UTC