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.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.30 by root, Mon Apr 21 23:35:24 2008 UTC

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

Diff Legend

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