--- deliantra/server/common/los.C 2006/12/23 13:56:25 1.11 +++ deliantra/server/common/los.C 2007/01/15 01:39:42 1.18 @@ -1,6 +1,7 @@ /* 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 @@ -27,7 +28,6 @@ #include #include - /* 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 @@ -295,7 +295,7 @@ } } - 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); @@ -332,7 +332,7 @@ 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)) @@ -351,7 +351,7 @@ */ 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; } @@ -396,6 +396,7 @@ { if (ax < 0 || ax >= op->contr->ns->mapx) continue; + for (ay = basey - light; ay <= basey + light; ay++) { if (ay < 0 || ay >= op->contr->ns->mapy) @@ -412,16 +413,15 @@ { x1 = abs (basex - ax) * abs (basex - ax); y1 = abs (basey - ay) * abs (basey - ay); - if (light > 0) - op->contr->blocked_los[ax][ay] -= MAX ((light - isqrt (x1 + y1)), 0); - if (light < 0) - op->contr->blocked_los[ax][ay] -= MIN ((light + isqrt (x1 + y1)), 0); + + if (light > 0) op->contr->blocked_los[ax][ay] -= max (light - isqrt (x1 + y1), 0); + if (light < 0) op->contr->blocked_los[ax][ay] -= min (light + isqrt (x1 + y1), 0); } - } /* for ay */ - } /* for ax */ - } /* if this space is providing light */ - } /* for y */ - } /* for x */ + } + } + } + } + } /* Outdoor should never really be completely pitch black dark like * a dungeon, so let the player at least see a little around themselves @@ -438,6 +438,7 @@ op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] = MAX_DARKNESS - 2; } } + /* grant some vision to the player, based on the darklevel */ for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++) for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++) @@ -451,7 +452,6 @@ * odd that you can see yourself (and what your standing on), but * really need for any reasonable game play. */ - static void blinded_sight (object *op) { @@ -509,7 +509,7 @@ /* 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 @@ -522,11 +522,10 @@ 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. @@ -539,7 +538,6 @@ * * map is the map that changed, x and y are the coordinates. */ - void update_all_los (const maptile *map, int x, int y) { @@ -548,7 +546,7 @@ /* 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. @@ -565,14 +563,14 @@ 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. @@ -583,22 +581,22 @@ */ 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; } }