ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/los.C
(Generate patch)

Comparing deliantra/server/common/los.C (file contents):
Revision 1.4 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.30 by root, Mon Apr 21 23:35:24 2008 UTC

1
2/* 1/*
3 * static char *rcsid_los_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 * "$Id: los.C,v 1.4 2006/09/10 16:00:23 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
12 7 *
13 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
14 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
15 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
16 (at your option) any later version. 11 * (at your option) any later version.
17 12 *
18 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details. 16 * GNU General Public License for more details.
22 17 *
23 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
26 21 * The authors can be reached via e-mail to <support@deliantra.net>
27 The authors can be reached via e-mail at crossfire-devel@real-time.com
28*/ 22 */
29 23
30/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */ 24/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
31 25
32#include <global.h> 26#include <global.h>
33#include <funcpoint.h>
34#include <math.h> 27#include <math.h>
35
36 28
37/* Distance must be less than this for the object to be blocked. 29/* Distance must be less than this for the object to be blocked.
38 * An object is 1.0 wide, so if set to 0.5, it means the object 30 * An object is 1.0 wide, so if set to 0.5, it means the object
39 * that blocks half the view (0.0 is complete block) will 31 * that blocks half the view (0.0 is complete block) will
40 * block view in our tables. 32 * block view in our tables.
… …
47{ 39{
48 int x[4], y[4]; 40 int x[4], y[4];
49 int index; 41 int index;
50} blocks; 42} blocks;
51 43
44// 31/32 == a speed hack
45// we would like to use 32 for speed, but the code loops endlessly
46// then, reason not yet identified, so only make the array use 32,
47// not the define's.
52blocks block[MAP_CLIENT_X][MAP_CLIENT_Y]; 48blocks block[MAP_CLIENT_X][MAP_CLIENT_Y == 31 ? 32 : MAP_CLIENT_Y];
53 49
54static void expand_lighted_sight (object *op); 50static void expand_lighted_sight (object *op);
55 51
56/* 52/*
57 * Used to initialise the array used by the LOS routines. 53 * Used to initialise the array used by the LOS routines.
… …
96 92
97void 93void
98init_block (void) 94init_block (void)
99{ 95{
100 int x, y, dx, dy, i; 96 int x, y, dx, dy, i;
101 static int block_x[3] = { -1, -1, 0 }, block_y[3] = 97 static int block_x[3] = { -1, -1, 0 },
102 { 98 block_y[3] = { -1, 0, -1 };
103 -1, 0, -1};
104 99
105 for (x = 0; x < MAP_CLIENT_X; x++) 100 for (x = 0; x < MAP_CLIENT_X; x++)
106 for (y = 0; y < MAP_CLIENT_Y; y++) 101 for (y = 0; y < MAP_CLIENT_Y; y++)
107 {
108 block[x][y].index = 0; 102 block[x][y].index = 0;
109 }
110 103
111 104
112 /* The table should be symmetric, so only do the upper left 105 /* The table should be symmetric, so only do the upper left
113 * quadrant - makes the processing easier. 106 * quadrant - makes the processing easier.
114 */ 107 */
… …
131 /* For simplicity, we mirror the coordinates to block the other 124 /* For simplicity, we mirror the coordinates to block the other
132 * quadrants. 125 * quadrants.
133 */ 126 */
134 set_block (x, y, dx, dy); 127 set_block (x, y, dx, dy);
135 if (x == MAP_CLIENT_X / 2) 128 if (x == MAP_CLIENT_X / 2)
136 {
137 set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1); 129 set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);
138 }
139 else if (y == MAP_CLIENT_Y / 2) 130 else if (y == MAP_CLIENT_Y / 2)
140 {
141 set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy); 131 set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
142 }
143 } 132 }
144 else 133 else
145 { 134 {
146 float d1, r, s, l; 135 float d1, r, s, l;
147 136
… …
150 * area. l is the distance from x,y to the line. 139 * area. l is the distance from x,y to the line.
151 * r is more a curiosity - it lets us know what direction (left/right) 140 * r is more a curiosity - it lets us know what direction (left/right)
152 * the line is off 141 * the line is off
153 */ 142 */
154 143
155 d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2) + pow (MAP_CLIENT_Y / 2 - dy, 2)); 144 d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2.f) + pow (MAP_CLIENT_Y / 2 - dy, 2.f));
156 r = (float) ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1; 145 r = (float) ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1;
157 s = (float) ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1; 146 s = (float) ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1;
158 l = FABS (sqrt (d1) * s); 147 l = FABS (sqrt (d1) * s);
159 148
160 if (l <= SPACE_BLOCK) 149 if (l <= SPACE_BLOCK)
… …
181 * that if some particular space is blocked, it blocks 170 * that if some particular space is blocked, it blocks
182 * the view of the spaces 'behind' it, and those blocked 171 * the view of the spaces 'behind' it, and those blocked
183 * spaces behind it may block other spaces, etc. 172 * spaces behind it may block other spaces, etc.
184 * In this way, the chain of visibility is set. 173 * In this way, the chain of visibility is set.
185 */ 174 */
186
187static void 175static void
188set_wall (object *op, int x, int y) 176set_wall (object *op, int x, int y)
189{ 177{
190 int i; 178 int i;
191 179
… …
194 int dx = block[x][y].x[i], dy = block[x][y].y[i], ax, ay; 182 int dx = block[x][y].x[i], dy = block[x][y].y[i], ax, ay;
195 183
196 /* ax, ay are the values as adjusted to be in the 184 /* ax, ay are the values as adjusted to be in the
197 * socket look structure. 185 * socket look structure.
198 */ 186 */
199 ax = dx - (MAP_CLIENT_X - op->contr->socket.mapx) / 2; 187 ax = dx - (MAP_CLIENT_X - op->contr->ns->mapx) / 2;
200 ay = dy - (MAP_CLIENT_Y - op->contr->socket.mapy) / 2; 188 ay = dy - (MAP_CLIENT_Y - op->contr->ns->mapy) / 2;
201 189
202 if (ax < 0 || ax >= op->contr->socket.mapx || ay < 0 || ay >= op->contr->socket.mapy) 190 if (ax < 0 || ax >= op->contr->ns->mapx || ay < 0 || ay >= op->contr->ns->mapy)
203 continue; 191 continue;
204#if 0 192#if 0
205 LOG (llevDebug, "blocked %d %d -> %d %d\n", dx, dy, ax, ay); 193 LOG (llevDebug, "blocked %d %d -> %d %d\n", dx, dy, ax, ay);
206#endif 194#endif
207 /* we need to adjust to the fact that the socket 195 /* we need to adjust to the fact that the socket
… …
226 214
227 if (!block[x][y].index) 215 if (!block[x][y].index)
228 return; 216 return;
229 217
230 /* ax, ay are coordinates as indexed into the look window */ 218 /* ax, ay are coordinates as indexed into the look window */
231 ax = x - (MAP_CLIENT_X - op->contr->socket.mapx) / 2; 219 ax = x - (MAP_CLIENT_X - op->contr->ns->mapx) / 2;
232 ay = y - (MAP_CLIENT_Y - op->contr->socket.mapy) / 2; 220 ay = y - (MAP_CLIENT_Y - op->contr->ns->mapy) / 2;
233 221
234 /* If the converted coordinates are outside the viewable 222 /* If the converted coordinates are outside the viewable
235 * area for the client, return now. 223 * area for the client, return now.
236 */ 224 */
237 if (ax < 0 || ay < 0 || ax >= op->contr->socket.mapx || ay >= op->contr->socket.mapy) 225 if (ax < 0 || ay < 0 || ax >= op->contr->ns->mapx || ay >= op->contr->ns->mapy)
238 return; 226 return;
239 227
240#if 0 228#if 0
241 LOG (llevDebug, "check_wall, ax,ay=%d, %d x,y = %d, %d blocksview = %d, %d\n", 229 LOG (llevDebug, "check_wall, ax,ay=%d, %d x,y = %d, %d blocksview = %d, %d\n",
242 ax, ay, x, y, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2); 230 ax, ay, x, y, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2);
… …
258 * Clears/initialises the los-array associated to the player 246 * Clears/initialises the los-array associated to the player
259 * controlling the object. 247 * controlling the object.
260 */ 248 */
261 249
262void 250void
263clear_los (object *op) 251clear_los (player *pl)
264{ 252{
265 /* This is safer than using the socket->mapx, mapy because 253 /* This is safer than using the ns->mapx, mapy because
266 * we index the blocked_los as a 2 way array, so clearing 254 * we index the blocked_los as a 2 way array, so clearing
267 * the first z spaces may not not cover the spaces we are 255 * the first z spaces may not not cover the spaces we are
268 * actually going to use 256 * actually going to use
269 */ 257 */
270 (void) memset ((void *) op->contr->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y); 258 memset (pl->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y);
271} 259}
272 260
273/* 261/*
274 * expand_sight goes through the array of what the given player is 262 * expand_sight goes through the array of what the given player is
275 * able to see, and expands the visible area a bit, so the player will, 263 * able to see, and expands the visible area a bit, so the player will,
… …
280static void 268static void
281expand_sight (object *op) 269expand_sight (object *op)
282{ 270{
283 int i, x, y, dx, dy; 271 int i, x, y, dx, dy;
284 272
285 for (x = 1; x < op->contr->socket.mapx - 1; x++) /* loop over inner squares */ 273 for (x = 1; x < op->contr->ns->mapx - 1; x++) /* loop over inner squares */
286 for (y = 1; y < op->contr->socket.mapy - 1; y++) 274 for (y = 1; y < op->contr->ns->mapy - 1; y++)
287 { 275 {
288 if (!op->contr->blocked_los[x][y] && 276 if (!op->contr->blocked_los[x][y] &&
289 !(get_map_flags (op->map, NULL, 277 !(get_map_flags (op->map, NULL,
290 op->x - op->contr->socket.mapx / 2 + x, 278 op->x - op->contr->ns->mapx / 2 + x,
291 op->y - op->contr->socket.mapy / 2 + y, NULL, NULL) & (P_BLOCKSVIEW | P_OUT_OF_MAP))) 279 op->y - op->contr->ns->mapy / 2 + y, NULL, NULL) & (P_BLOCKSVIEW | P_OUT_OF_MAP)))
292 { 280 {
293 281
294 for (i = 1; i <= 8; i += 1) 282 for (i = 1; i <= 8; i += 1)
295 { /* mark all directions */ 283 { /* mark all directions */
296 dx = x + freearr_x[i]; 284 dx = x + freearr_x[i];
… …
299 op->contr->blocked_los[dx][dy] = -1; 287 op->contr->blocked_los[dx][dy] = -1;
300 } 288 }
301 } 289 }
302 } 290 }
303 291
304 if (MAP_DARKNESS (op->map) > 0) /* player is on a dark map */ 292 if (op->map->darkness > 0) /* player is on a dark map */
305 expand_lighted_sight (op); 293 expand_lighted_sight (op);
306 294
307
308 /* clear mark squares */ 295 /* clear mark squares */
309 for (x = 0; x < op->contr->socket.mapx; x++) 296 for (x = 0; x < op->contr->ns->mapx; x++)
310 for (y = 0; y < op->contr->socket.mapy; y++) 297 for (y = 0; y < op->contr->ns->mapy; y++)
311 if (op->contr->blocked_los[x][y] < 0) 298 if (op->contr->blocked_los[x][y] < 0)
312 op->contr->blocked_los[x][y] = 0; 299 op->contr->blocked_los[x][y] = 0;
313} 300}
314
315
316
317 301
318/* returns true if op carries one or more lights 302/* returns true if op carries one or more lights
319 * This is a trivial function now days, but it used to 303 * This is a trivial function now days, but it used to
320 * be a bit longer. Probably better for callers to just 304 * be a bit longer. Probably better for callers to just
321 * check the op->glow_radius instead of calling this. 305 * check the op->glow_radius instead of calling this.
… …
333 317
334static void 318static void
335expand_lighted_sight (object *op) 319expand_lighted_sight (object *op)
336{ 320{
337 int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1; 321 int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1;
338 mapstruct *m = op->map; 322 maptile *m = op->map;
339 sint16 nx, ny; 323 sint16 nx, ny;
340 324
341 darklevel = MAP_DARKNESS (m); 325 darklevel = m->darkness;
342 326
343 /* If the player can see in the dark, lower the darklevel for him */ 327 /* If the player can see in the dark, lower the darklevel for him */
344 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 328 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
345 darklevel -= 2; 329 darklevel -= 2;
346 330
… …
355 /* Do a sanity check. If not valid, some code below may do odd 339 /* Do a sanity check. If not valid, some code below may do odd
356 * things. 340 * things.
357 */ 341 */
358 if (darklevel > MAX_DARKNESS) 342 if (darklevel > MAX_DARKNESS)
359 { 343 {
360 LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, op->map->path, darklevel); 344 LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);
361 darklevel = MAX_DARKNESS; 345 darklevel = MAX_DARKNESS;
362 } 346 }
363 347
364 /* First, limit player furthest (unlighted) vision */ 348 /* First, limit player furthest (unlighted) vision */
365 for (x = 0; x < op->contr->socket.mapx; x++) 349 for (x = 0; x < op->contr->ns->mapx; x++)
366 for (y = 0; y < op->contr->socket.mapy; y++) 350 for (y = 0; y < op->contr->ns->mapy; y++)
367 if (op->contr->blocked_los[x][y] != 100) 351 if (op->contr->blocked_los[x][y] != 100)
368 op->contr->blocked_los[x][y] = MAX_LIGHT_RADII; 352 op->contr->blocked_los[x][y] = MAX_LIGHT_RADII;
369 353
370 /* the spaces[] darkness value contains the information we need. 354 /* the spaces[] darkness value contains the information we need.
371 * Only process the area of interest. 355 * Only process the area of interest.
372 * the basex, basey values represent the position in the op->contr->blocked_los 356 * the basex, basey values represent the position in the op->contr->blocked_los
373 * array. Its easier to just increment them here (and start with the right 357 * array. Its easier to just increment them here (and start with the right
374 * value) than to recalculate them down below. 358 * value) than to recalculate them down below.
375 */ 359 */
376 for (x = (op->x - op->contr->socket.mapx / 2 - MAX_LIGHT_RADII), basex = -MAX_LIGHT_RADII; 360 for (x = (op->x - op->contr->ns->mapx / 2 - MAX_LIGHT_RADII), basex = -MAX_LIGHT_RADII;
377 x <= (op->x + op->contr->socket.mapx / 2 + MAX_LIGHT_RADII); x++, basex++) 361 x <= (op->x + op->contr->ns->mapx / 2 + MAX_LIGHT_RADII); x++, basex++)
378 { 362 {
379 363
380 for (y = (op->y - op->contr->socket.mapy / 2 - MAX_LIGHT_RADII), basey = -MAX_LIGHT_RADII; 364 for (y = (op->y - op->contr->ns->mapy / 2 - MAX_LIGHT_RADII), basey = -MAX_LIGHT_RADII;
381 y <= (op->y + op->contr->socket.mapy / 2 + MAX_LIGHT_RADII); y++, basey++) 365 y <= (op->y + op->contr->ns->mapy / 2 + MAX_LIGHT_RADII); y++, basey++)
382 { 366 {
383 m = op->map; 367 m = op->map;
384 nx = x; 368 nx = x;
385 ny = y; 369 ny = y;
386 370
… …
398#if 0 382#if 0
399 LOG (llevDebug, "expand_lighted_sight: Found light at x=%d, y=%d, basex=%d, basey=%d\n", x, y, basex, basey); 383 LOG (llevDebug, "expand_lighted_sight: Found light at x=%d, y=%d, basex=%d, basey=%d\n", x, y, basex, basey);
400#endif 384#endif
401 for (ax = basex - light; ax <= basex + light; ax++) 385 for (ax = basex - light; ax <= basex + light; ax++)
402 { 386 {
403 if (ax < 0 || ax >= op->contr->socket.mapx) 387 if (ax < 0 || ax >= op->contr->ns->mapx)
404 continue; 388 continue;
389
405 for (ay = basey - light; ay <= basey + light; ay++) 390 for (ay = basey - light; ay <= basey + light; ay++)
406 { 391 {
407 if (ay < 0 || ay >= op->contr->socket.mapy) 392 if (ay < 0 || ay >= op->contr->ns->mapy)
408 continue; 393 continue;
409 394
410 /* If the space is fully blocked, do nothing. Otherwise, we 395 /* If the space is fully blocked, do nothing. Otherwise, we
411 * brighten the space. The further the light is away from the 396 * brighten the space. The further the light is away from the
412 * source (basex-x), the less effect it has. Though light used 397 * source (basex-x), the less effect it has. Though light used
… …
416 */ 401 */
417 if (op->contr->blocked_los[ax][ay] != 100) 402 if (op->contr->blocked_los[ax][ay] != 100)
418 { 403 {
419 x1 = abs (basex - ax) * abs (basex - ax); 404 x1 = abs (basex - ax) * abs (basex - ax);
420 y1 = abs (basey - ay) * abs (basey - ay); 405 y1 = abs (basey - ay) * abs (basey - ay);
421 if (light > 0) 406
422 op->contr->blocked_los[ax][ay] -= MAX ((light - isqrt (x1 + y1)), 0); 407 if (light > 0) op->contr->blocked_los[ax][ay] -= max (light - isqrt (x1 + y1), 0);
423 if (light < 0)
424 op->contr->blocked_los[ax][ay] -= MIN ((light + isqrt (x1 + y1)), 0); 408 if (light < 0) op->contr->blocked_los[ax][ay] -= min (light + isqrt (x1 + y1), 0);
425 } 409 }
426 } /* for ay */ 410 }
427 } /* for ax */ 411 }
428 } /* if this space is providing light */ 412 }
429 } /* for y */ 413 }
430 } /* for x */ 414 }
431 415
432 /* Outdoor should never really be completely pitch black dark like 416 /* Outdoor should never really be completely pitch black dark like
433 * a dungeon, so let the player at least see a little around themselves 417 * a dungeon, so let the player at least see a little around themselves
434 */ 418 */
435 if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3)) 419 if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3))
436 { 420 {
437 if (op->contr->blocked_los[op->contr->socket.mapx / 2][op->contr->socket.mapy / 2] > (MAX_DARKNESS - 3)) 421 if (op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] > (MAX_DARKNESS - 3))
438 op->contr->blocked_los[op->contr->socket.mapx / 2][op->contr->socket.mapy / 2] = MAX_DARKNESS - 3; 422 op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = MAX_DARKNESS - 3;
439 423
440 for (x = -1; x <= 1; x++) 424 for (x = -1; x <= 1; x++)
441 for (y = -1; y <= 1; y++) 425 for (y = -1; y <= 1; y++)
442 { 426 {
443 if (op->contr->blocked_los[x + op->contr->socket.mapx / 2][y + op->contr->socket.mapy / 2] > (MAX_DARKNESS - 2)) 427 if (op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] > (MAX_DARKNESS - 2))
444 op->contr->blocked_los[x + op->contr->socket.mapx / 2][y + op->contr->socket.mapy / 2] = MAX_DARKNESS - 2; 428 op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] = MAX_DARKNESS - 2;
445 } 429 }
446 } 430 }
431
447 /* grant some vision to the player, based on the darklevel */ 432 /* grant some vision to the player, based on the darklevel */
448 for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++) 433 for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)
449 for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++) 434 for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)
450 if (!(op->contr->blocked_los[x + op->contr->socket.mapx / 2][y + op->contr->socket.mapy / 2] == 100)) 435 if (!(op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] == 100))
451 op->contr->blocked_los[x + op->contr->socket.mapx / 2][y + op->contr->socket.mapy / 2] -= 436 op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] -=
452 MAX (0, 6 - darklevel - MAX (abs (x), abs (y))); 437 MAX (0, 6 - darklevel - MAX (abs (x), abs (y)));
453} 438}
454 439
455/* blinded_sight() - sets all veiwable squares to blocked except 440/* blinded_sight() - sets all veiwable squares to blocked except
456 * for the one the central one that the player occupies. A little 441 * for the one the central one that the player occupies. A little
457 * odd that you can see yourself (and what your standing on), but 442 * odd that you can see yourself (and what your standing on), but
458 * really need for any reasonable game play. 443 * really need for any reasonable game play.
459 */ 444 */
460
461static void 445static void
462blinded_sight (object *op) 446blinded_sight (object *op)
463{ 447{
464 int x, y; 448 int x, y;
465 449
466 for (x = 0; x < op->contr->socket.mapx; x++) 450 for (x = 0; x < op->contr->ns->mapx; x++)
467 for (y = 0; y < op->contr->socket.mapy; y++) 451 for (y = 0; y < op->contr->ns->mapy; y++)
468 op->contr->blocked_los[x][y] = 100; 452 op->contr->blocked_los[x][y] = 100;
469 453
470 op->contr->blocked_los[op->contr->socket.mapx / 2][op->contr->socket.mapy / 2] = 0; 454 op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = 0;
471} 455}
472 456
473/* 457/*
474 * update_los() recalculates the array which specifies what is 458 * update_los() recalculates the array which specifies what is
475 * visible for the given player-object. 459 * visible for the given player-object.
476 */ 460 */
477
478void 461void
479update_los (object *op) 462update_los (object *op)
480{ 463{
481 int dx = op->contr->socket.mapx / 2, dy = op->contr->socket.mapy / 2, x, y; 464 int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y;
482 465
483 if (QUERY_FLAG (op, FLAG_REMOVED)) 466 if (QUERY_FLAG (op, FLAG_REMOVED))
484 return; 467 return;
485 468
486 clear_los (op); 469 clear_los (op->contr);
470
487 if (QUERY_FLAG (op, FLAG_WIZ) /* ||XRAYS(op) */ ) 471 if (QUERY_FLAG (op, FLAG_WIZ) /* ||XRAYS(op) */ )
488 return; 472 return;
489 473
490 /* For larger maps, this is more efficient than the old way which 474 /* For larger maps, this is more efficient than the old way which
491 * used the chaining of the block array. Since many space views could 475 * used the chaining of the block array. Since many space views could
492 * be blocked by different spaces in front, this mean that a lot of spaces 476 * be blocked by different spaces in front, this mean that a lot of spaces
493 * could be examined multile times, as each path would be looked at. 477 * could be examined multile times, as each path would be looked at.
494 */ 478 */
495 for (x = (MAP_CLIENT_X - op->contr->socket.mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->socket.mapx) / 2 + 1; x++) 479 for (x = (MAP_CLIENT_X - op->contr->ns->mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->ns->mapx) / 2 + 1; x++)
496 for (y = (MAP_CLIENT_Y - op->contr->socket.mapy) / 2 - 1; y < (MAP_CLIENT_Y + op->contr->socket.mapy) / 2 + 1; y++) 480 for (y = (MAP_CLIENT_Y - op->contr->ns->mapy) / 2 - 1; y < (MAP_CLIENT_Y + op->contr->ns->mapy) / 2 + 1; y++)
497 check_wall (op, x, y); 481 check_wall (op, x, y);
498
499 482
500 /* do the los of the player. 3 (potential) cases */ 483 /* do the los of the player. 3 (potential) cases */
501 if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */ 484 if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */
502 blinded_sight (op); 485 blinded_sight (op);
503 else 486 else
504 expand_sight (op); 487 expand_sight (op);
505 488
489 //TODO: no range-checking whatsoever :(
506 if (QUERY_FLAG (op, FLAG_XRAYS)) 490 if (QUERY_FLAG (op, FLAG_XRAYS))
507 {
508 int x, y;
509
510 for (x = -2; x <= 2; x++) 491 for (int x = -2; x <= 2; x++)
511 for (y = -2; y <= 2; y++) 492 for (int y = -2; y <= 2; y++)
512 op->contr->blocked_los[dx + x][dy + y] = 0; 493 op->contr->blocked_los[dx + x][dy + y] = 0;
513 }
514} 494}
515 495
516/* update all_map_los is like update_all_los below, 496/* update all_map_los is like update_all_los below,
517 * but updates everyone on the map, no matter where they 497 * but updates everyone on the map, no matter where they
518 * are. This generally should not be used, as a per 498 * are. This generally should not be used, as a per
519 * specific map change doesn't make much sense when tiling 499 * specific map change doesn't make much sense when tiling
520 * is considered (lowering darkness would certainly be a 500 * is considered (lowering darkness would certainly be a
521 * strange effect if done on a tile map, as it makes 501 * strange effect if done on a tile map, as it makes
522 * the distinction between maps much more obvious to the 502 * the distinction between maps much more obvious to the
523 * players, which is should not be. 503 * players, which is should not be.
524 * Currently, this function is called from the 504 * Currently, this function is called from the
525 * change_map_light function 505 * change_map_light function
526 */ 506 */
527void 507void
528update_all_map_los (mapstruct *map) 508update_all_map_los (maptile *map)
529{ 509{
530 player *pl; 510 for_all_players (pl)
531
532 for (pl = first_player; pl != NULL; pl = pl->next)
533 {
534 if (pl->ob->map == map) 511 if (pl->ob && pl->ob->map == map)
535 pl->do_los = 1; 512 pl->do_los = 1;
536 }
537} 513}
538
539 514
540/* 515/*
541 * This function makes sure that update_los() will be called for all 516 * This function makes sure that update_los() will be called for all
542 * players on the given map within the next frame. 517 * players on the given map within the next frame.
543 * It is triggered by removal or inserting of objects which blocks 518 * It is triggered by removal or inserting of objects which blocks
… …
547 * means that just being on the same map is not sufficient - the 522 * means that just being on the same map is not sufficient - the
548 * space that changes must be withing your viewable area. 523 * space that changes must be withing your viewable area.
549 * 524 *
550 * map is the map that changed, x and y are the coordinates. 525 * map is the map that changed, x and y are the coordinates.
551 */ 526 */
552
553void 527void
554update_all_los (const mapstruct *map, int x, int y) 528update_all_los (const maptile *map, int x, int y)
555{ 529{
556 player *pl; 530 for_all_players (pl)
557
558 for (pl = first_player; pl != NULL; pl = pl->next)
559 { 531 {
560 /* Player should not have a null map, but do this 532 /* Player should not have a null map, but do this
561 * check as a safety 533 * check as a safety
562 */ 534 */
563 if (!pl->ob->map) 535 if (!pl->ob || !pl->ob->map || !pl->ns)
564 continue; 536 continue;
565 537
566 /* Same map is simple case - see if pl is close enough. 538 /* Same map is simple case - see if pl is close enough.
567 * Note in all cases, we did the check for same map first, 539 * Note in all cases, we did the check for same map first,
568 * and then see if the player is close enough and update 540 * and then see if the player is close enough and update
… …
572 * so by setting it up this way, we trim processing 544 * so by setting it up this way, we trim processing
573 * some. 545 * some.
574 */ 546 */
575 if (pl->ob->map == map) 547 if (pl->ob->map == map)
576 { 548 {
577 if ((abs (pl->ob->x - x) <= pl->socket.mapx / 2) && (abs (pl->ob->y - y) <= pl->socket.mapy / 2)) 549 if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
578 pl->do_los = 1; 550 pl->do_los = 1;
579 } 551 }
552
580 /* Now we check to see if player is on adjacent 553 /* Now we check to see if player is on adjacent
581 * maps to the one that changed and also within 554 * maps to the one that changed and also within
582 * view. The tile_maps[] could be null, but in that 555 * view. The tile_maps[] could be null, but in that
583 * case it should never match the pl->ob->map, so 556 * case it should never match the pl->ob->map, so
584 * we want ever try to dereference any of the data in it. 557 * we want ever try to dereference any of the data in it.
585 */ 558 *
586
587 /* The logic for 0 and 3 is to see how far the player is 559 * The logic for 0 and 3 is to see how far the player is
588 * from the edge of the map (height/width) - pl->ob->(x,y) 560 * from the edge of the map (height/width) - pl->ob->(x,y)
589 * and to add current position on this map - that gives a 561 * and to add current position on this map - that gives a
590 * distance. 562 * distance.
591 * For 1 and 2, we check to see how far the given 563 * For 1 and 2, we check to see how far the given
592 * coordinate (x,y) is from the corresponding edge, 564 * coordinate (x,y) is from the corresponding edge,
593 * and then add the players location, which gives 565 * and then add the players location, which gives
594 * a distance. 566 * a distance.
595 */ 567 */
596 else if (pl->ob->map == map->tile_map[0]) 568 else if (pl->ob->map == map->tile_map[0])
597 { 569 {
598 if ((abs (pl->ob->x - x) <= pl->socket.mapx / 2) && (abs (y + MAP_HEIGHT (map->tile_map[0]) - pl->ob->y) <= pl->socket.mapy / 2)) 570 if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (y + map->tile_map[0]->height - pl->ob->y) <= pl->ns->mapy / 2))
599 pl->do_los = 1; 571 pl->do_los = 1;
600 } 572 }
601 else if (pl->ob->map == map->tile_map[2]) 573 else if (pl->ob->map == map->tile_map[2])
602 { 574 {
603 if ((abs (pl->ob->x - x) <= pl->socket.mapx / 2) && (abs (pl->ob->y + MAP_HEIGHT (map) - y) <= pl->socket.mapy / 2)) 575 if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y + map->height - y) <= pl->ns->mapy / 2))
604 pl->do_los = 1; 576 pl->do_los = 1;
605 } 577 }
606 else if (pl->ob->map == map->tile_map[1]) 578 else if (pl->ob->map == map->tile_map[1])
607 { 579 {
608 if ((abs (pl->ob->x + MAP_WIDTH (map) - x) <= pl->socket.mapx / 2) && (abs (pl->ob->y - y) <= pl->socket.mapy / 2)) 580 if ((abs (pl->ob->x + map->width - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
609 pl->do_los = 1; 581 pl->do_los = 1;
610 } 582 }
611 else if (pl->ob->map == map->tile_map[3]) 583 else if (pl->ob->map == map->tile_map[3])
612 { 584 {
613 if ((abs (x + MAP_WIDTH (map->tile_map[3]) - pl->ob->x) <= pl->socket.mapx / 2) && (abs (pl->ob->y - y) <= pl->socket.mapy / 2)) 585 if ((abs (x + map->tile_map[3]->width - pl->ob->x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
614 pl->do_los = 1; 586 pl->do_los = 1;
615 } 587 }
616 } 588 }
617} 589}
618 590
619/* 591/*
620 * Debug-routine which dumps the array which specifies the visible 592 * Debug-routine which dumps the array which specifies the visible
621 * area of a player. Triggered by the z key in DM mode. 593 * area of a player. Triggered by the z key in DM mode.
622 */ 594 */
623
624void 595void
625print_los (object *op) 596print_los (object *op)
626{ 597{
627 int x, y; 598 int x, y;
628 char buf[50], buf2[10]; 599 char buf[50], buf2[10];
629 600
630 strcpy (buf, " "); 601 strcpy (buf, " ");
602
631 for (x = 0; x < op->contr->socket.mapx; x++) 603 for (x = 0; x < op->contr->ns->mapx; x++)
632 { 604 {
633 sprintf (buf2, "%2d", x); 605 sprintf (buf2, "%2d", x);
634 strcat (buf, buf2); 606 strcat (buf, buf2);
635 } 607 }
608
636 new_draw_info (NDI_UNIQUE, 0, op, buf); 609 new_draw_info (NDI_UNIQUE, 0, op, buf);
610
637 for (y = 0; y < op->contr->socket.mapy; y++) 611 for (y = 0; y < op->contr->ns->mapy; y++)
638 { 612 {
639 sprintf (buf, "%2d:", y); 613 sprintf (buf, "%2d:", y);
614
640 for (x = 0; x < op->contr->socket.mapx; x++) 615 for (x = 0; x < op->contr->ns->mapx; x++)
641 { 616 {
642 sprintf (buf2, " %1d", op->contr->blocked_los[x][y]); 617 sprintf (buf2, " %1d", op->contr->blocked_los[x][y]);
643 strcat (buf, buf2); 618 strcat (buf, buf2);
644 } 619 }
620
645 new_draw_info (NDI_UNIQUE, 0, op, buf); 621 new_draw_info (NDI_UNIQUE, 0, op, buf);
646 } 622 }
647} 623}
648 624
649/* 625/*
… …
652 */ 628 */
653 629
654void 630void
655make_sure_seen (const object *op) 631make_sure_seen (const object *op)
656{ 632{
657 player *pl; 633 for_all_players (pl)
658
659 for (pl = first_player; pl; pl = pl->next)
660 if (pl->ob->map == op->map && 634 if (pl->ob->map == op->map &&
661 pl->ob->y - pl->socket.mapy / 2 <= op->y && 635 pl->ob->y - pl->ns->mapy / 2 <= op->y &&
662 pl->ob->y + pl->socket.mapy / 2 >= op->y && pl->ob->x - pl->socket.mapx / 2 <= op->x && pl->ob->x + pl->socket.mapx / 2 >= op->x) 636 pl->ob->y + pl->ns->mapy / 2 >= op->y && pl->ob->x - pl->ns->mapx / 2 <= op->x && pl->ob->x + pl->ns->mapx / 2 >= op->x)
663 pl->blocked_los[pl->socket.mapx / 2 + op->x - pl->ob->x][pl->socket.mapy / 2 + op->y - pl->ob->y] = 0; 637 pl->blocked_los[pl->ns->mapx / 2 + op->x - pl->ob->x][pl->ns->mapy / 2 + op->y - pl->ob->y] = 0;
664} 638}
665 639
666/* 640/*
667 * make_sure_not_seen: The object which is supposed to be visible through 641 * make_sure_not_seen: The object which is supposed to be visible through
668 * walls has just been removed from the map, so update the los of any 642 * walls has just been removed from the map, so update the los of any
… …
670 */ 644 */
671 645
672void 646void
673make_sure_not_seen (const object *op) 647make_sure_not_seen (const object *op)
674{ 648{
675 player *pl; 649 for_all_players (pl)
676
677 for (pl = first_player; pl; pl = pl->next)
678 if (pl->ob->map == op->map && 650 if (pl->ob->map == op->map &&
679 pl->ob->y - pl->socket.mapy / 2 <= op->y && 651 pl->ob->y - pl->ns->mapy / 2 <= op->y &&
680 pl->ob->y + pl->socket.mapy / 2 >= op->y && pl->ob->x - pl->socket.mapx / 2 <= op->x && pl->ob->x + pl->socket.mapx / 2 >= op->x) 652 pl->ob->y + pl->ns->mapy / 2 >= op->y && pl->ob->x - pl->ns->mapx / 2 <= op->x && pl->ob->x + pl->ns->mapx / 2 >= op->x)
681 pl->do_los = 1; 653 pl->do_los = 1;
682} 654}

Diff Legend

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