--- deliantra/server/common/los.C 2007/01/15 01:39:42 1.18 +++ deliantra/server/common/los.C 2007/02/15 03:19:02 1.21 @@ -1,26 +1,26 @@ /* - 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 - the Free Software Foundation; either version 2 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 - 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 - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The authors can be reached via e-mail at -*/ + * 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 + * the Free Software Foundation; either version 2 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 + * 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 + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * The authors can be reached via e-mail at + */ /* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */ @@ -298,7 +298,6 @@ 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++) @@ -306,9 +305,6 @@ 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 @@ -490,21 +486,17 @@ 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 (y = -2; y <= 2; y++) - op->contr->blocked_los[dx + x][dy + y] = 0; - } + for (int x = -2; x <= 2; x++) + for (int y = -2; y <= 2; y++) + op->contr->blocked_los[dx + x][dy + y] = 0; } /* update all_map_los is like update_all_los below,