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

Comparing deliantra/server/common/los.C (file contents):
Revision 1.11 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.16 by pippijn, Sat Jan 6 14:42:29 2007 UTC

 /*
     CrossFire, A Multiplayer game for X-windows
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
                   op->contr->blocked_los[dx][dy] = -1;
               }
           }
       }
-  if (MAP_DARKNESS (op->map) > 0)       /* player is on a dark map */
+  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++)
 {
   int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1;
   maptile *m = op->map;
   sint16 nx, ny;
-  darklevel = MAP_DARKNESS (m);
+  darklevel = m->darkness;
   /* If the player can see in the dark, lower the darklevel for him */
   if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
     darklevel -= 2;
   /* Do a sanity check.  If not valid, some code below may do odd
    * things.
    */
   if (darklevel > MAX_DARKNESS)
     {
-      LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, op->map->path, darklevel);
+      LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);
       darklevel = MAX_DARKNESS;
     }
   /* First, limit player furthest (unlighted) vision */
   for (x = 0; x < op->contr->ns->mapx; x++)
     }
 }
 /* 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
+ * are. This generally should not be used, as a per
  * specific map change doesn't make much sense when tiling
  * is considered (lowering darkness would certainly be a
  * strange effect if done on a tile map, as it makes
  * the distinction between maps much more obvious to the
  * players, which is should not be.
  */
 void
 update_all_map_los (maptile *map)
 {
   for_all_players (pl)
-    if (pl->ob->map == map)
+    if (pl->ob && pl->ob->map == map)
       pl->do_los = 1;
 }
 /*
  * This function makes sure that update_los() will be called for all
  * players on the given map within the next frame.
  * It is triggered by removal or inserting of objects which blocks
  * means that just being on the same map is not sufficient - the
  * space that changes must be withing your viewable area.
  *
  * map is the map that changed, x and y are the coordinates.
  */
 void
 update_all_los (const maptile *map, int x, int y)
 {
   for_all_players (pl)
     {
       /* Player should not have a null map, but do this
        * check as a safety
        */
-      if (!pl->ob->map)
+      if (!pl->ob || !pl->ob->map || !pl->ns)
         continue;
       /* Same map is simple case - see if pl is close enough.
        * Note in all cases, we did the check for same map first,
        * and then see if the player is close enough and update
       if (pl->ob->map == map)
         {
           if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
             pl->do_los = 1;
         }
       /* Now we check to see if player is on adjacent
        * maps to the one that changed and also within
        * view.  The tile_maps[] could be null, but in that
        * case it should never match the pl->ob->map, so
        * we want ever try to dereference any of the data in it.
-       */
+       *
-      /* The logic for 0 and 3 is to see how far the player is
+       * The logic for 0 and 3 is to see how far the player is
        * from the edge of the map (height/width) - pl->ob->(x,y)
        * and to add current position on this map - that gives a
        * distance.
        * For 1 and 2, we check to see how far the given
        * coordinate (x,y) is from the corresponding edge,
        * and then add the players location, which gives
        * a distance.
        */
       else if (pl->ob->map == map->tile_map[0])
         {
-          if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (y + MAP_HEIGHT (map->tile_map[0]) - pl->ob->y) <= pl->ns->mapy / 2))
+          if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (y + map->tile_map[0]->height - pl->ob->y) <= pl->ns->mapy / 2))
             pl->do_los = 1;
         }
       else if (pl->ob->map == map->tile_map[2])
         {
-          if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y + MAP_HEIGHT (map) - y) <= pl->ns->mapy / 2))
+          if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y + map->height - y) <= pl->ns->mapy / 2))
             pl->do_los = 1;
         }
       else if (pl->ob->map == map->tile_map[1])
         {
-          if ((abs (pl->ob->x + MAP_WIDTH (map) - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
+          if ((abs (pl->ob->x + map->width - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
             pl->do_los = 1;
         }
       else if (pl->ob->map == map->tile_map[3])
         {
-          if ((abs (x + MAP_WIDTH (map->tile_map[3]) - pl->ob->x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
+          if ((abs (x + map->tile_map[3]->width - pl->ob->x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
             pl->do_los = 1;
         }
     }
 }

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.11 by root, Sat Dec 23 13:56:25 2006 UTC vs. Revision 1.16 by pippijn, Sat Jan 6 14:42:29 2007 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.11 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.16 by pippijn, Sat Jan 6 14:42:29 2007 UTC