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.15 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.60 by root, Sun Jan 11 06:08:40 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23
24/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
25 23
26#include <global.h> 24#include <global.h>
27#include <funcpoint.h>
28#include <math.h> 25#include <cmath>
29 26
27#define SEE_IN_DARK_RADIUS 2
28#define MAX_VISION 10 // maximum visible radius
30 29
31/* Distance must be less than this for the object to be blocked. 30// los flags
32 * An object is 1.0 wide, so if set to 0.5, it means the object 31enum {
33 * that blocks half the view (0.0 is complete block) will 32 FLG_XI = 0x01, // we have an x-parent
34 * block view in our tables. 33 FLG_YI = 0x02, // we have an y-parent
35 * .4 or less lets you see through walls. .5 is about right. 34 FLG_BLOCKED = 0x04, // this space blocks the view
36 */ 35 FLG_QUEUED = 0x80 // already queued in queue, or border
36};
37 37
38#define SPACE_BLOCK 0.5 38struct los_info
39
40typedef struct blstr
41{ 39{
42 int x[4], y[4]; 40 uint8 flags; // FLG_xxx
43 int index; 41 uint8 culled; // culled from "tree"
44} blocks; 42 uint8 visible;
43 uint8 pad0;
45 44
45 sint8 xo, yo; // obscure angle
46 sint8 xe, ye; // angle deviation
47};
48
49// temporary storage for the los algorithm,
50// one los_info for each lightable map space
46blocks block[MAP_CLIENT_X][MAP_CLIENT_Y]; 51static los_info los[MAP_CLIENT_X][MAP_CLIENT_Y];
47 52
48static void expand_lighted_sight (object *op); 53struct point
49
50/*
51 * Used to initialise the array used by the LOS routines.
52 * What this sets if that x,y blocks the view of bx,by
53 * This then sets up a relation - for example, something
54 * at 5,4 blocks view at 5,3 which blocks view at 5,2
55 * etc. So when we check 5,4 and find it block, we have
56 * the data to know that 5,3 and 5,2 and 5,1 should also
57 * be blocked.
58 */
59
60static void
61set_block (int x, int y, int bx, int by)
62{ 54{
63 int index = block[x][y].index, i;
64
65 /* Due to flipping, we may get duplicates - better safe than sorry.
66 */
67 for (i = 0; i < index; i++)
68 {
69 if (block[x][y].x[i] == bx && block[x][y].y[i] == by)
70 return;
71 }
72
73 block[x][y].x[index] = bx;
74 block[x][y].y[index] = by;
75 block[x][y].index++;
76#ifdef LOS_DEBUG
77 LOG (llevDebug, "setblock: added %d %d -> %d %d (%d)\n", x, y, bx, by, block[x][y].index);
78#endif
79}
80
81/*
82 * initialises the array used by the LOS routines.
83 */
84
85/* since we are only doing the upper left quadrant, only
86 * these spaces could possibly get blocked, since these
87 * are the only ones further out that are still possibly in the
88 * sightline.
89 */
90
91void
92init_block (void)
93{
94 int x, y, dx, dy, i;
95 static int block_x[3] = { -1, -1, 0 }, block_y[3] =
96 {
97 -1, 0, -1};
98
99 for (x = 0; x < MAP_CLIENT_X; x++)
100 for (y = 0; y < MAP_CLIENT_Y; y++)
101 {
102 block[x][y].index = 0;
103 }
104
105
106 /* The table should be symmetric, so only do the upper left
107 * quadrant - makes the processing easier.
108 */
109 for (x = 1; x <= MAP_CLIENT_X / 2; x++)
110 {
111 for (y = 1; y <= MAP_CLIENT_Y / 2; y++)
112 {
113 for (i = 0; i < 3; i++)
114 {
115 dx = x + block_x[i];
116 dy = y + block_y[i];
117
118 /* center space never blocks */
119 if (x == MAP_CLIENT_X / 2 && y == MAP_CLIENT_Y / 2)
120 continue;
121
122 /* If its a straight line, its blocked */
123 if ((dx == x && x == MAP_CLIENT_X / 2) || (dy == y && y == MAP_CLIENT_Y / 2))
124 {
125 /* For simplicity, we mirror the coordinates to block the other
126 * quadrants.
127 */
128 set_block (x, y, dx, dy);
129 if (x == MAP_CLIENT_X / 2)
130 {
131 set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);
132 }
133 else if (y == MAP_CLIENT_Y / 2)
134 {
135 set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
136 }
137 }
138 else
139 {
140 float d1, r, s, l;
141
142 /* We use the algorihm that found out how close the point
143 * (x,y) is to the line from dx,dy to the center of the viewable
144 * area. l is the distance from x,y to the line.
145 * r is more a curiosity - it lets us know what direction (left/right)
146 * the line is off
147 */
148
149 d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2.f) + pow (MAP_CLIENT_Y / 2 - dy, 2.f));
150 r = (float) ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1;
151 s = (float) ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1;
152 l = FABS (sqrt (d1) * s);
153
154 if (l <= SPACE_BLOCK)
155 {
156 /* For simplicity, we mirror the coordinates to block the other
157 * quadrants.
158 */
159 set_block (x, y, dx, dy);
160 set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
161 set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);
162 set_block (MAP_CLIENT_X - x - 1, MAP_CLIENT_Y - y - 1, MAP_CLIENT_X - dx - 1, MAP_CLIENT_Y - dy - 1);
163 }
164 }
165 }
166 }
167 }
168}
169
170/*
171 * Used to initialise the array used by the LOS routines.
172 * x,y are indexes into the blocked[][] array.
173 * This recursively sets the blocked line of sight view.
174 * From the blocked[][] array, we know for example
175 * that if some particular space is blocked, it blocks
176 * the view of the spaces 'behind' it, and those blocked
177 * spaces behind it may block other spaces, etc.
178 * In this way, the chain of visibility is set.
179 */
180
181static void
182set_wall (object *op, int x, int y)
183{
184 int i;
185
186 for (i = 0; i < block[x][y].index; i++)
187 {
188 int dx = block[x][y].x[i], dy = block[x][y].y[i], ax, ay;
189
190 /* ax, ay are the values as adjusted to be in the
191 * socket look structure.
192 */
193 ax = dx - (MAP_CLIENT_X - op->contr->ns->mapx) / 2;
194 ay = dy - (MAP_CLIENT_Y - op->contr->ns->mapy) / 2;
195
196 if (ax < 0 || ax >= op->contr->ns->mapx || ay < 0 || ay >= op->contr->ns->mapy)
197 continue;
198#if 0
199 LOG (llevDebug, "blocked %d %d -> %d %d\n", dx, dy, ax, ay);
200#endif
201 /* we need to adjust to the fact that the socket
202 * code wants the los to start from the 0,0
203 * and not be relative to middle of los array.
204 */
205 op->contr->blocked_los[ax][ay] = 100;
206 set_wall (op, dx, dy);
207 }
208}
209
210/*
211 * Used to initialise the array used by the LOS routines.
212 * op is the object, x and y values based on MAP_CLIENT_X and Y.
213 * this is because they index the blocked[][] arrays.
214 */
215
216static void
217check_wall (object *op, int x, int y)
218{
219 int ax, ay; 55 sint8 x, y;
56};
220 57
221 if (!block[x][y].index) 58// minimum size, but must be a power of two
222 return; 59#define QUEUE_LENGTH ((MAP_CLIENT_X + MAP_CLIENT_Y) * 2)
223 60
224 /* ax, ay are coordinates as indexed into the look window */ 61// a queue of spaces to calculate
225 ax = x - (MAP_CLIENT_X - op->contr->ns->mapx) / 2; 62static point queue [QUEUE_LENGTH];
226 ay = y - (MAP_CLIENT_Y - op->contr->ns->mapy) / 2; 63static int q1, q2; // queue start, end
227
228 /* If the converted coordinates are outside the viewable
229 * area for the client, return now.
230 */
231 if (ax < 0 || ay < 0 || ax >= op->contr->ns->mapx || ay >= op->contr->ns->mapy)
232 return;
233
234#if 0
235 LOG (llevDebug, "check_wall, ax,ay=%d, %d x,y = %d, %d blocksview = %d, %d\n",
236 ax, ay, x, y, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2);
237#endif
238
239 /* If this space is already blocked, prune the processing - presumably
240 * whatever has set this space to be blocked has done the work and already
241 * done the dependency chain.
242 */
243 if (op->contr->blocked_los[ax][ay] == 100)
244 return;
245
246
247 if (get_map_flags (op->map, NULL, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2, NULL, NULL) & (P_BLOCKSVIEW | P_OUT_OF_MAP))
248 set_wall (op, x, y);
249}
250 64
251/* 65/*
252 * Clears/initialises the los-array associated to the player 66 * Clears/initialises the los-array associated to the player
253 * controlling the object. 67 * controlling the object.
254 */ 68 */
255
256void 69void
257clear_los (object *op) 70player::clear_los (sint8 value)
258{ 71{
259 /* This is safer than using the ns->mapx, mapy because 72 memset (los, value, sizeof (los));
260 * we index the blocked_los as a 2 way array, so clearing
261 * the first z spaces may not not cover the spaces we are
262 * actually going to use
263 */
264 (void) memset ((void *) op->contr->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y);
265} 73}
266 74
267/* 75// enqueue a single mapspace, but only if it hasn't
268 * expand_sight goes through the array of what the given player is 76// been enqueued yet.
269 * able to see, and expands the visible area a bit, so the player will,
270 * to a certain degree, be able to see into corners.
271 * This is somewhat suboptimal, would be better to improve the formula.
272 */
273
274static void 77static void
275expand_sight (object *op) 78enqueue (sint8 dx, sint8 dy, uint8 flags = 0)
276{ 79{
277 int i, x, y, dx, dy; 80 sint8 x = LOS_X0 + dx;
81 sint8 y = LOS_Y0 + dy;
278 82
279 for (x = 1; x < op->contr->ns->mapx - 1; x++) /* loop over inner squares */ 83 los_info &l = los[x][y];
280 for (y = 1; y < op->contr->ns->mapy - 1; y++) 84
85 l.flags |= flags;
86
87 if (l.flags & FLG_QUEUED)
88 return;
89
90 l.flags |= FLG_QUEUED;
91
92 queue[q1].x = dx;
93 queue[q1].y = dy;
94
95 q1 = (q1 + 1) & (QUEUE_LENGTH - 1);
96}
97
98// run the los algorithm
99// this is a variant of a spiral los algorithm taken from
100// http://www.geocities.com/temerra/los_rays.html
101// which has been simplified and changed considerably, but
102// still is basically the same algorithm.
103static void
104calculate_los (player *pl)
105{
106 {
107 memset (los, 0, sizeof (los));
108
109 // we keep one line for ourselves, for the border flag
110 // so the client area is actually MAP_CLIENT_(X|Y) - 2
111 int half_x = min (LOS_X0 - 1, pl->ns->mapx / 2);
112 int half_y = min (LOS_Y0 - 1, pl->ns->mapy / 2);
113
114 // create borders, the corners are not touched
115 for (int dx = -half_x; dx <= half_x; ++dx)
116 los [dx + LOS_X0][LOS_Y0 - (half_y + 1)].flags =
117 los [dx + LOS_X0][LOS_Y0 + (half_y + 1)].flags = FLG_QUEUED;
118
119 for (int dy = -half_y; dy <= half_y; ++dy)
120 los [LOS_X0 - (half_x + 1)][dy + LOS_Y0].flags =
121 los [LOS_X0 + (half_x + 1)][dy + LOS_Y0].flags = FLG_QUEUED;
122
123 // now reset the los area and also add blocked flags
124 // which supposedly is faster than doing it inside the
125 // spiral path algorithm below, except when very little
126 // area is visible, in which case it is slower. which evens
127 // out los calculation times between large and small los maps.
128 // apply_lights also iterates over this area, maybe these
129 // two passes could be combined somehow.
130 unordered_mapwalk (pl->observe, -half_x, -half_y, half_x, half_y)
281 { 131 {
282 if (!op->contr->blocked_los[x][y] && 132 los_info &l = los [LOS_X0 + dx][LOS_Y0 + dy];
283 !(get_map_flags (op->map, NULL, 133 l.flags = m->at (nx, ny).flags () & P_BLOCKSVIEW ? FLG_BLOCKED : 0;
284 op->x - op->contr->ns->mapx / 2 + x, 134 }
285 op->y - op->contr->ns->mapy / 2 + y, NULL, NULL) & (P_BLOCKSVIEW | P_OUT_OF_MAP))) 135 }
136
137 q1 = 0; q2 = 0; // initialise queue, not strictly required
138 enqueue (0, 0); // enqueue center
139
140 // treat the origin specially
141 los[LOS_X0][LOS_Y0].visible = 1;
142 pl->los[LOS_X0][LOS_Y0] = 0;
143
144 // loop over all enqueued points until the queue is empty
145 // the order in which this is done ensures that we
146 // never touch a mapspace whose input spaces we haven't checked
147 // yet.
148 while (q1 != q2)
149 {
150 sint8 dx = queue[q2].x;
151 sint8 dy = queue[q2].y;
152
153 q2 = (q2 + 1) & (QUEUE_LENGTH - 1);
154
155 sint8 x = LOS_X0 + dx;
156 sint8 y = LOS_Y0 + dy;
157
158 los_info &l = los[x][y];
159
160 if (expect_true (l.flags & (FLG_XI | FLG_YI)))
161 {
162 l.culled = 1;
163 l.xo = l.yo = l.xe = l.ye = 0;
164
165 // check contributing spaces, first horizontal
166 if (expect_true (l.flags & FLG_XI))
167 {
168 los_info *xi = &los[x - sign (dx)][y];
169
170 // don't cull unless obscured
171 l.culled &= !xi->visible;
172
173 /* merge input space */
174 if (expect_false (xi->xo || xi->yo))
175 {
176 // The X input can provide two main pieces of information:
177 // 1. Progressive X obscurity.
178 // 2. Recessive Y obscurity.
179
180 // Progressive X obscurity, favouring recessive input angle
181 if (xi->xe > 0 && l.xo == 0)
182 {
183 l.xe = xi->xe - xi->yo;
184 l.ye = xi->ye + xi->yo;
185 l.xo = xi->xo;
186 l.yo = xi->yo;
187 }
188
189 // Recessive Y obscurity
190 if (xi->ye <= 0 && xi->yo > 0 && xi->xe > 0)
191 {
192 l.ye = xi->yo + xi->ye;
193 l.xe = xi->xe - xi->yo;
194 l.xo = xi->xo;
195 l.yo = xi->yo;
196 }
197 }
198 }
199
200 // check contributing spaces, last vertical, identical structure
201 if (expect_true (l.flags & FLG_YI))
202 {
203 los_info *yi = &los[x][y - sign (dy)];
204
205 // don't cull unless obscured
206 l.culled &= !yi->visible;
207
208 /* merge input space */
209 if (expect_false (yi->yo || yi->xo))
210 {
211 // The Y input can provide two main pieces of information:
212 // 1. Progressive Y obscurity.
213 // 2. Recessive X obscurity.
214
215 // Progressive Y obscurity, favouring recessive input angle
216 if (yi->ye > 0 && l.yo == 0)
217 {
218 l.ye = yi->ye - yi->xo;
219 l.xe = yi->xe + yi->xo;
220 l.yo = yi->yo;
221 l.xo = yi->xo;
222 }
223
224 // Recessive X obscurity
225 if (yi->xe <= 0 && yi->xo > 0 && yi->ye > 0)
226 {
227 l.xe = yi->xo + yi->xe;
228 l.ye = yi->ye - yi->xo;
229 l.yo = yi->yo;
230 l.xo = yi->xo;
231 }
232 }
233 }
234
235 if (l.flags & FLG_BLOCKED)
236 {
237 l.xo = l.xe = abs (dx);
238 l.yo = l.ye = abs (dy);
239
240 // we obscure dependents, but might be visible
241 // copy the los from the square towards the player,
242 // so outward diagonal corners are lit.
243 pl->los[x][y] = los[x - sign0 (dx)][y - sign0 (dy)].visible ? 0 : LOS_BLOCKED;
244
245 l.visible = false;
246 }
247 else
248 {
249 // we are not blocked, so calculate visibility, by checking
250 // whether we are inside or outside the shadow
251 l.visible = (l.xe <= 0 || l.xe > l.xo)
252 && (l.ye <= 0 || l.ye > l.yo);
253
254 pl->los[x][y] = l.culled ? LOS_BLOCKED
255 : l.visible ? 0
256 : 3;
257 }
258
259 }
260
261 // Expands by the unit length in each component's current direction.
262 // If a component has no direction, then it is expanded in both of its
263 // positive and negative directions.
264 if (!l.culled)
265 {
266 if (dx >= 0) enqueue (dx + 1, dy, FLG_XI);
267 if (dx <= 0) enqueue (dx - 1, dy, FLG_XI);
268 if (dy >= 0) enqueue (dx, dy + 1, FLG_YI);
269 if (dy <= 0) enqueue (dx, dy - 1, FLG_YI);
270 }
271 }
272}
273
274/* radius, distance => lightness adjust */
275static sint8 light_atten[MAX_LIGHT_RADIUS * 2 + 1][MAX_LIGHT_RADIUS * 3 / 2 + 1];
276static sint8 vision_atten[MAX_VISION + 1][MAX_VISION * 3 / 2 + 1];
277
278static struct los_init
279{
280 los_init ()
281 {
282 assert (("QUEUE_LENGTH, MAP_CLIENT_X and MAP_CLIENT_Y *must* be powers of two",
283 !(QUEUE_LENGTH & (QUEUE_LENGTH - 1))));
284
285 /* for lights */
286 for (int radius = -MAX_LIGHT_RADIUS; radius <= MAX_LIGHT_RADIUS; ++radius)
287 for (int distance = 0; distance <= MAX_LIGHT_RADIUS * 3 / 2; ++distance)
288 {
289 // max intensity
290 int intensity = min (LOS_MAX, abs (radius) + 1);
291
292 // actual intensity
293 intensity = max (0, lerp_rd (distance, 0, abs (radius) + 1, intensity, 0));
294
295 light_atten [radius + MAX_LIGHT_RADIUS][distance] = radius < 0
296 ? min (3, intensity)
297 : LOS_MAX - intensity;
298 }
299
300 /* for general vision */
301 for (int radius = 0; radius <= MAX_VISION; ++radius)
302 for (int distance = 0; distance <= MAX_VISION * 3 / 2; ++distance)
303 vision_atten [radius][distance] = distance <= radius ? clamp (lerp (radius, 0, MAX_DARKNESS, 3, 0), 0, 3) : 4;
304 }
305} los_init;
306
307sint8
308los_brighten (sint8 b, sint8 l)
309{
310 return b == LOS_BLOCKED ? b : min (b, l);
311}
312
313sint8
314los_darken (sint8 b, sint8 l)
315{
316 return max (b, l);
317}
318
319template<sint8 change_it (sint8, sint8)>
320static void
321apply_light (player *pl, int dx, int dy, int light, const sint8 *atten_table)
322{
323 // min or max the circular area around basex, basey
324 dx += LOS_X0;
325 dy += LOS_Y0;
326
327 int hx = pl->ns->mapx / 2;
328 int hy = pl->ns->mapy / 2;
329
330 int ax0 = max (LOS_X0 - hx, dx - light);
331 int ay0 = max (LOS_Y0 - hy, dy - light);
332 int ax1 = min (dx + light, LOS_X0 + hx);
333 int ay1 = min (dy + light, LOS_Y0 + hy);
334
335 for (int ax = ax0; ax <= ax1; ax++)
336 for (int ay = ay0; ay <= ay1; ay++)
337 pl->los[ax][ay] =
338 change_it (pl->los[ax][ay], atten_table [idistance (ax - dx, ay - dy)]);
339}
340
341/* add light, by finding all (non-null) nearby light sources, then
342 * mark those squares specially.
343 */
344static void
345apply_lights (player *pl)
346{
347 object *op = pl->observe;
348 int darklevel = op->map->darklevel ();
349
350 int half_x = pl->ns->mapx / 2;
351 int half_y = pl->ns->mapy / 2;
352
353 int pass2 = 0; // negative lights have an extra pass
354
355 maprect *rects = pl->observe->map->split_to_tiles (
356 pl->observe->x - half_x - MAX_LIGHT_RADIUS,
357 pl->observe->y - half_y - MAX_LIGHT_RADIUS,
358 pl->observe->x + half_x + MAX_LIGHT_RADIUS + 1,
359 pl->observe->y + half_y + MAX_LIGHT_RADIUS + 1
360 );
361
362 /* If the player can see in the dark, increase light/vision radius */
363 int bonus = op->flag [FLAG_SEE_IN_DARK] ? SEE_IN_DARK_RADIUS : 0;
364
365 if (!darklevel)
366 pass2 = 1;
367 else
368 {
369 /* first, make everything totally dark */
370 for (int dx = -half_x; dx <= half_x; dx++)
371 for (int dy = -half_x; dy <= half_y; dy++)
372 max_it (pl->los[dx + LOS_X0][dy + LOS_Y0], LOS_MAX);
373
374 /*
375 * Only process the area of interest.
376 * the basex, basey values represent the position in the op->contr->los
377 * array. Its easier to just increment them here (and start with the right
378 * value) than to recalculate them down below.
379 */
380 for (maprect *r = rects; r->m; ++r)
381 rect_mapwalk (r, 0, 0)
286 { 382 {
383 mapspace &ms = m->at (nx, ny);
384 ms.update ();
385 sint8 light = ms.light;
287 386
288 for (i = 1; i <= 8; i += 1) 387 if (expect_false (light))
289 { /* mark all directions */ 388 if (light < 0)
290 dx = x + freearr_x[i]; 389 pass2 = 1;
291 dy = y + freearr_y[i]; 390 else
292 if (op->contr->blocked_los[dx][dy] > 0) /* for any square blocked */ 391 {
293 op->contr->blocked_los[dx][dy] = -1; 392 light = clamp (light + bonus, 0, MAX_LIGHT_RADIUS);
393 apply_light<los_brighten> (pl, dx - pl->observe->x, dy - pl->observe->y, light, light_atten [light + MAX_LIGHT_RADIUS]);
294 } 394 }
295 } 395 }
396
397 /* grant some vision to the player, based on outside, outdoor, and darklevel */
398 {
399 int light;
400
401 if (!op->map->outdoor) // not outdoor, darkness becomes light radius
402 light = MAX_DARKNESS - op->map->darkness;
403 else if (op->map->darkness > 0) // outdoor and darkness > 0 => use darkness as max radius
404 light = lerp_rd (maptile::outdoor_darkness + 0, 0, MAX_DARKNESS, MAX_DARKNESS - op->map->darkness, 0);
405 else // outdoor and darkness <= 0 => start wide and decrease quickly
406 light = lerp (maptile::outdoor_darkness + op->map->darkness, 0, MAX_DARKNESS, MAX_VISION, 2);
407
408 light = clamp (light + bonus, 0, MAX_VISION);
409
410 apply_light<los_brighten> (pl, 0, 0, light, vision_atten [light]);
296 } 411 }
297
298 if (op->map->darkness > 0) /* player is on a dark map */
299 expand_lighted_sight (op);
300
301
302 /* clear mark squares */
303 for (x = 0; x < op->contr->ns->mapx; x++)
304 for (y = 0; y < op->contr->ns->mapy; y++)
305 if (op->contr->blocked_los[x][y] < 0)
306 op->contr->blocked_los[x][y] = 0;
307}
308
309
310
311
312/* returns true if op carries one or more lights
313 * This is a trivial function now days, but it used to
314 * be a bit longer. Probably better for callers to just
315 * check the op->glow_radius instead of calling this.
316 */
317
318int
319has_carried_lights (const object *op)
320{
321 /* op may glow! */
322 if (op->glow_radius > 0)
323 return 1;
324
325 return 0;
326}
327
328static void
329expand_lighted_sight (object *op)
330{
331 int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1;
332 maptile *m = op->map;
333 sint16 nx, ny;
334
335 darklevel = m->darkness;
336
337 /* If the player can see in the dark, lower the darklevel for him */
338 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
339 darklevel -= 2;
340
341 /* add light, by finding all (non-null) nearby light sources, then
342 * mark those squares specially. If the darklevel<1, there is no
343 * reason to do this, so we skip this function
344 */
345
346 if (darklevel < 1)
347 return;
348
349 /* Do a sanity check. If not valid, some code below may do odd
350 * things.
351 */
352 if (darklevel > MAX_DARKNESS)
353 {
354 LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);
355 darklevel = MAX_DARKNESS;
356 } 412 }
357 413
358 /* First, limit player furthest (unlighted) vision */ 414 // possibly do 2nd pass for rare negative glow radii
359 for (x = 0; x < op->contr->ns->mapx; x++) 415 // for effect, those are always considered to be stronger than anything else
360 for (y = 0; y < op->contr->ns->mapy; y++) 416 // but they can't darken a place completely
361 if (op->contr->blocked_los[x][y] != 100) 417 if (pass2)
362 op->contr->blocked_los[x][y] = MAX_LIGHT_RADII; 418 for (maprect *r = rects; r->m; ++r)
363 419 rect_mapwalk (r, 0, 0)
364 /* the spaces[] darkness value contains the information we need.
365 * Only process the area of interest.
366 * the basex, basey values represent the position in the op->contr->blocked_los
367 * array. Its easier to just increment them here (and start with the right
368 * value) than to recalculate them down below.
369 */
370 for (x = (op->x - op->contr->ns->mapx / 2 - MAX_LIGHT_RADII), basex = -MAX_LIGHT_RADII;
371 x <= (op->x + op->contr->ns->mapx / 2 + MAX_LIGHT_RADII); x++, basex++)
372 {
373
374 for (y = (op->y - op->contr->ns->mapy / 2 - MAX_LIGHT_RADII), basey = -MAX_LIGHT_RADII;
375 y <= (op->y + op->contr->ns->mapy / 2 + MAX_LIGHT_RADII); y++, basey++)
376 { 420 {
377 m = op->map; 421 mapspace &ms = m->at (nx, ny);
378 nx = x; 422 ms.update ();
379 ny = y; 423 sint8 light = ms.light;
380 424
381 mflags = get_map_flags (m, &m, nx, ny, &nx, &ny); 425 if (expect_false (light < 0))
382
383 if (mflags & P_OUT_OF_MAP)
384 continue;
385
386 /* This space is providing light, so we need to brighten up the
387 * spaces around here.
388 */
389 light = GET_MAP_LIGHT (m, nx, ny);
390 if (light != 0)
391 { 426 {
392#if 0 427 light = clamp (light - bonus, 0, MAX_DARKNESS);
393 LOG (llevDebug, "expand_lighted_sight: Found light at x=%d, y=%d, basex=%d, basey=%d\n", x, y, basex, basey); 428 apply_light<los_darken> (pl, dx - pl->observe->x, dy - pl->observe->y, -light, light_atten [light + MAX_LIGHT_RADIUS]);
394#endif
395 for (ax = basex - light; ax <= basex + light; ax++)
396 {
397 if (ax < 0 || ax >= op->contr->ns->mapx)
398 continue;
399 for (ay = basey - light; ay <= basey + light; ay++)
400 {
401 if (ay < 0 || ay >= op->contr->ns->mapy)
402 continue;
403
404 /* If the space is fully blocked, do nothing. Otherwise, we
405 * brighten the space. The further the light is away from the
406 * source (basex-x), the less effect it has. Though light used
407 * to dim in a square manner, it now dims in a circular manner
408 * using the the pythagorean theorem. glow_radius still
409 * represents the radius
410 */
411 if (op->contr->blocked_los[ax][ay] != 100)
412 {
413 x1 = abs (basex - ax) * abs (basex - ax);
414 y1 = abs (basey - ay) * abs (basey - ay);
415 if (light > 0)
416 op->contr->blocked_los[ax][ay] -= MAX ((light - isqrt (x1 + y1)), 0);
417 if (light < 0)
418 op->contr->blocked_los[ax][ay] -= MIN ((light + isqrt (x1 + y1)), 0);
419 }
420 } /* for ay */
421 } /* for ax */
422 } /* if this space is providing light */
423 } /* for y */
424 } /* for x */
425
426 /* Outdoor should never really be completely pitch black dark like
427 * a dungeon, so let the player at least see a little around themselves
428 */
429 if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3))
430 {
431 if (op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] > (MAX_DARKNESS - 3))
432 op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = MAX_DARKNESS - 3;
433
434 for (x = -1; x <= 1; x++)
435 for (y = -1; y <= 1; y++)
436 {
437 if (op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] > (MAX_DARKNESS - 2))
438 op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] = MAX_DARKNESS - 2;
439 } 429 }
440 } 430 }
441 /* grant some vision to the player, based on the darklevel */
442 for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)
443 for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)
444 if (!(op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] == 100))
445 op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] -=
446 MAX (0, 6 - darklevel - MAX (abs (x), abs (y)));
447} 431}
448 432
449/* blinded_sight() - sets all veiwable squares to blocked except 433/* blinded_sight() - sets all viewable squares to blocked except
450 * for the one the central one that the player occupies. A little 434 * for the one the central one that the player occupies. A little
451 * odd that you can see yourself (and what your standing on), but 435 * odd that you can see yourself (and what your standing on), but
452 * really need for any reasonable game play. 436 * really need for any reasonable game play.
453 */ 437 */
454
455static void 438static void
456blinded_sight (object *op) 439blinded_sight (player *pl)
457{ 440{
458 int x, y; 441 pl->los[LOS_X0][LOS_Y0] = 1;
459
460 for (x = 0; x < op->contr->ns->mapx; x++)
461 for (y = 0; y < op->contr->ns->mapy; y++)
462 op->contr->blocked_los[x][y] = 100;
463
464 op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = 0;
465} 442}
466 443
467/* 444/*
468 * update_los() recalculates the array which specifies what is 445 * update_los() recalculates the array which specifies what is
469 * visible for the given player-object. 446 * visible for the given player-object.
470 */ 447 */
471
472void 448void
473update_los (object *op) 449player::update_los ()
474{ 450{
475 int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y; 451 if (ob->flag [FLAG_REMOVED])//D really needed?
476
477 if (QUERY_FLAG (op, FLAG_REMOVED))
478 return; 452 return;
479 453
454 if (ob->flag [FLAG_WIZLOOK])
480 clear_los (op); 455 clear_los (0);
481 if (QUERY_FLAG (op, FLAG_WIZ) /* ||XRAYS(op) */ ) 456 else if (observe->flag [FLAG_BLIND]) /* player is blind */
482 return; 457 {
483 458 clear_los ();
484 /* For larger maps, this is more efficient than the old way which
485 * used the chaining of the block array. Since many space views could
486 * be blocked by different spaces in front, this mean that a lot of spaces
487 * could be examined multile times, as each path would be looked at.
488 */
489 for (x = (MAP_CLIENT_X - op->contr->ns->mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->ns->mapx) / 2 + 1; x++)
490 for (y = (MAP_CLIENT_Y - op->contr->ns->mapy) / 2 - 1; y < (MAP_CLIENT_Y + op->contr->ns->mapy) / 2 + 1; y++)
491 check_wall (op, x, y);
492
493
494 /* do the los of the player. 3 (potential) cases */
495 if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */
496 blinded_sight (op); 459 blinded_sight (this);
460 }
497 else 461 else
498 expand_sight (op);
499
500 if (QUERY_FLAG (op, FLAG_XRAYS))
501 { 462 {
502 int x, y; 463 clear_los ();
503 464 calculate_los (this);
504 for (x = -2; x <= 2; x++) 465 apply_lights (this);
505 for (y = -2; y <= 2; y++)
506 op->contr->blocked_los[dx + x][dy + y] = 0;
507 } 466 }
467
468 if (observe->flag [FLAG_XRAYS])
469 for (int dx = -2; dx <= 2; dx++)
470 for (int dy = -2; dy <= 2; dy++)
471 min_it (los[dx + LOS_X0][dy + LOS_Y0], 1);
508} 472}
509 473
510/* update all_map_los is like update_all_los below, 474/* update all_map_los is like update_all_los below,
511 * but updates everyone on the map, no matter where they 475 * but updates everyone on the map, no matter where they
512 * are. This generally should not be used, as a per 476 * are. This generally should not be used, as a per
519 * change_map_light function 483 * change_map_light function
520 */ 484 */
521void 485void
522update_all_map_los (maptile *map) 486update_all_map_los (maptile *map)
523{ 487{
524 for_all_players (pl) 488 for_all_players_on_map (pl, map)
525 if (pl->ob && pl->ob->map == map)
526 pl->do_los = 1; 489 pl->do_los = 1;
527} 490}
528 491
529/* 492/*
530 * This function makes sure that update_los() will be called for all 493 * This function makes sure that update_los() will be called for all
531 * players on the given map within the next frame. 494 * players on the given map within the next frame.
539 * map is the map that changed, x and y are the coordinates. 502 * map is the map that changed, x and y are the coordinates.
540 */ 503 */
541void 504void
542update_all_los (const maptile *map, int x, int y) 505update_all_los (const maptile *map, int x, int y)
543{ 506{
507 // no need to do anything if we don't have darkness
508 if (map->darklevel () <= 0)
509 return;
510
511 map->at (x, y).invalidate ();
512
544 for_all_players (pl) 513 for_all_players (pl)
545 { 514 {
546 /* Player should not have a null map, but do this 515 /* Player should not have a null map, but do this
547 * check as a safety 516 * check as a safety
548 */ 517 */
557 * player can't be on another map that may be closer, 526 * player can't be on another map that may be closer,
558 * so by setting it up this way, we trim processing 527 * so by setting it up this way, we trim processing
559 * some. 528 * some.
560 */ 529 */
561 if (pl->ob->map == map) 530 if (pl->ob->map == map)
562 {
563 if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2)) 531 if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
564 pl->do_los = 1; 532 pl->do_los = 1;
565 }
566 533
567 /* Now we check to see if player is on adjacent 534 /* Now we check to see if player is on adjacent
568 * maps to the one that changed and also within 535 * maps to the one that changed and also within
569 * view. The tile_maps[] could be null, but in that 536 * view. The tile_maps[] could be null, but in that
570 * case it should never match the pl->ob->map, so 537 * case it should never match the pl->ob->map, so
600 pl->do_los = 1; 567 pl->do_los = 1;
601 } 568 }
602 } 569 }
603} 570}
604 571
572static const int season_darkness[5][HOURS_PER_DAY] = {
573 /*0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 2 3 4 5 6 7 8 9 10 11 12 13 */
574 { 5, 5, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 1, 2, 2, 2, 3, 3, 4, 4, 5 },
575 { 5, 5, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4 },
576 { 5, 4, 4, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 4, 4 },
577 { 4, 4, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 4 },
578 { 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4 }
579};
580
605/* 581/*
606 * Debug-routine which dumps the array which specifies the visible 582 * Tell players the time and compute the darkness level for all maps in the game.
607 * area of a player. Triggered by the z key in DM mode. 583 * MUST be called exactly once per hour.
608 */ 584 */
609void 585void
610print_los (object *op) 586maptile::adjust_daylight ()
611{ 587{
612 int x, y; 588 timeofday_t tod;
613 char buf[50], buf2[10];
614 589
615 strcpy (buf, " "); 590 get_tod (&tod);
616 591
617 for (x = 0; x < op->contr->ns->mapx; x++) 592 // log the time to log-1 every hour, and to chat every day
618 { 593 {
619 sprintf (buf2, "%2d", x); 594 char todbuf[512];
620 strcat (buf, buf2); 595
596 format_tod (todbuf, sizeof (todbuf), &tod);
597
598 for_all_players (pl)
599 pl->ns->send_msg (NDI_GREY, tod.hour == 15 ? CHAT_CHANNEL : LOG_CHANNEL, todbuf);
621 } 600 }
622 601
623 new_draw_info (NDI_UNIQUE, 0, op, buf); 602 /* If the light level isn't changing, no reason to do all
603 * the work below.
604 */
605 sint8 new_darkness = season_darkness[tod.season][tod.hour];
624 606
625 for (y = 0; y < op->contr->ns->mapy; y++) 607 if (new_darkness == maptile::outdoor_darkness)
626 { 608 return;
627 sprintf (buf, "%2d:", y);
628 609
629 for (x = 0; x < op->contr->ns->mapx; x++) 610 new_draw_info (NDI_GREY | NDI_UNIQUE | NDI_ALL, 1, 0,
630 { 611 new_darkness > maptile::outdoor_darkness
631 sprintf (buf2, " %1d", op->contr->blocked_los[x][y]); 612 ? "It becomes darker."
632 strcat (buf, buf2); 613 : "It becomes brighter.");
633 }
634 614
635 new_draw_info (NDI_UNIQUE, 0, op, buf); 615 maptile::outdoor_darkness = new_darkness;
636 } 616
617 // we simply update the los for all players, which is unnecessarily
618 // costly, but should do for the moment.
619 for_all_players (pl)
620 pl->do_los = 1;
637} 621}
638 622
639/* 623/*
640 * make_sure_seen: The object is supposed to be visible through walls, thus 624 * make_sure_seen: The object is supposed to be visible through walls, thus
641 * check if any players are nearby, and edit their LOS array. 625 * check if any players are nearby, and edit their LOS array.
642 */ 626 */
643
644void 627void
645make_sure_seen (const object *op) 628make_sure_seen (const object *op)
646{ 629{
647 for_all_players (pl) 630 for_all_players (pl)
648 if (pl->ob->map == op->map && 631 if (pl->ob->map == op->map &&
649 pl->ob->y - pl->ns->mapy / 2 <= op->y && 632 pl->ob->y - pl->ns->mapy / 2 <= op->y &&
650 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) 633 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)
651 pl->blocked_los[pl->ns->mapx / 2 + op->x - pl->ob->x][pl->ns->mapy / 2 + op->y - pl->ob->y] = 0; 634 pl->los[op->x - pl->ob->x + LOS_X0][op->y - pl->ob->y + LOS_Y0] = 0;
652} 635}
653 636
654/* 637/*
655 * make_sure_not_seen: The object which is supposed to be visible through 638 * make_sure_not_seen: The object which is supposed to be visible through
656 * walls has just been removed from the map, so update the los of any 639 * walls has just been removed from the map, so update the los of any
657 * players within its range 640 * players within its range
658 */ 641 */
659
660void 642void
661make_sure_not_seen (const object *op) 643make_sure_not_seen (const object *op)
662{ 644{
663 for_all_players (pl) 645 for_all_players (pl)
664 if (pl->ob->map == op->map && 646 if (pl->ob->map == op->map &&
665 pl->ob->y - pl->ns->mapy / 2 <= op->y && 647 pl->ob->y - pl->ns->mapy / 2 <= op->y &&
666 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) 648 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)
667 pl->do_los = 1; 649 pl->do_los = 1;
668} 650}
651

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines