1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
3 | |
3 | * |
4 | Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
5 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
7 | |
7 | * |
8 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | 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 |
10 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | (at your option) any later version. |
11 | * (at your option) any later version. |
12 | |
12 | * |
13 | 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, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | |
17 | * |
18 | 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 |
19 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | |
21 | * |
22 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | /** |
25 | /** |
26 | * \file |
26 | * \file |
27 | * Basic client output functions. |
27 | * Basic client output functions. |
28 | * |
28 | * |
… | |
… | |
86 | |
86 | |
87 | if (pl->type == PLAYER) |
87 | if (pl->type == PLAYER) |
88 | esrv_print_msg (pl->contr->ns, colr, (char *) tmp); |
88 | esrv_print_msg (pl->contr->ns, colr, (char *) tmp); |
89 | } |
89 | } |
90 | |
90 | |
91 | /** |
91 | bool |
92 | * Prints out the contents of specified buffer structures, |
92 | client::msg_suppressed (const char *msg) |
93 | * and clears the string. |
|
|
94 | */ |
|
|
95 | void |
|
|
96 | flush_output_element (const object *pl, Output_Buf * outputs) |
|
|
97 | { |
93 | { |
98 | char tbuf[MAX_BUF]; |
94 | if (!pl) |
99 | |
|
|
100 | if (outputs->buf == NULL) |
|
|
101 | return; |
95 | return false; |
102 | if (outputs->count > 1) |
96 | |
103 | { |
97 | if (pl->outputs_count <= 1 || !pl->outputs_sync) |
104 | snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf); |
98 | return false; |
105 | print_message (NDI_BLACK, pl, tbuf); |
99 | |
|
|
100 | int len = strlen (msg); |
|
|
101 | |
|
|
102 | if (len > MSG_BUF_SIZE) |
|
|
103 | return false; |
|
|
104 | |
|
|
105 | msg_buf *lru = msgbuf; |
|
|
106 | for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf) |
106 | } |
107 | { |
107 | else |
108 | if (len == buf->len && !memcmp (msg, buf->msg, len)) |
108 | print_message (NDI_BLACK, pl, &outputs->buf); |
|
|
109 | |
|
|
110 | outputs->buf = NULL; |
|
|
111 | outputs->first_update = 0; /* This way, it will be reused */ |
|
|
112 | } |
|
|
113 | |
|
|
114 | /** |
|
|
115 | * Sends message to player through output buffers. |
|
|
116 | * \param pl player to send message |
|
|
117 | * \param buf message to send |
|
|
118 | * |
|
|
119 | * If player's output_count is 1, sends message directly. |
|
|
120 | * |
|
|
121 | * Else checks output buffers for specified message. |
|
|
122 | * |
|
|
123 | * If found, checks if message should be sent now. |
|
|
124 | * |
|
|
125 | * If message not already in buffers, flushes olders buffer, |
|
|
126 | * and adds message to queue. |
|
|
127 | */ |
|
|
128 | static void |
|
|
129 | check_output_buffers (const object *pl, const char *buf) |
|
|
130 | { |
|
|
131 | int i, oldest = 0; |
|
|
132 | |
|
|
133 | if (pl->contr->outputs_count < 2) |
|
|
134 | { |
|
|
135 | print_message (NDI_BLACK, pl, buf); |
|
|
136 | return; |
|
|
137 | } |
|
|
138 | else |
|
|
139 | { |
|
|
140 | for (i = 0; i < NUM_OUTPUT_BUFS; i++) |
|
|
141 | { |
109 | { |
142 | if (pl->contr->outputs[i].buf && !strcmp (buf, pl->contr->outputs[i].buf)) |
110 | // found matching buf, see if expired |
|
|
111 | if (buf->expire <= pticks || !buf->count) |
143 | break; |
112 | { |
144 | else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) |
113 | // yes, take over matching buffer, print |
145 | oldest = i; |
114 | buf->expire = pticks + pl->outputs_sync; |
|
|
115 | buf->count = pl->outputs_count; |
|
|
116 | |
|
|
117 | return false; |
|
|
118 | } |
|
|
119 | |
|
|
120 | // no, suppress |
|
|
121 | --buf->count; |
|
|
122 | return true; |
146 | } |
123 | } |
147 | /* We found a match */ |
|
|
148 | if (i < NUM_OUTPUT_BUFS) |
|
|
149 | { |
|
|
150 | pl->contr->outputs[i].count++; |
|
|
151 | if (pl->contr->outputs[i].count >= pl->contr->outputs_count) |
|
|
152 | { |
|
|
153 | flush_output_element (pl, &pl->contr->outputs[i]); |
|
|
154 | } |
|
|
155 | } |
|
|
156 | /* No match - flush the oldest, and put the new one in */ |
|
|
157 | else |
|
|
158 | { |
|
|
159 | flush_output_element (pl, &pl->contr->outputs[oldest]); |
|
|
160 | |
124 | |
161 | pl->contr->outputs[oldest].first_update = pticks; |
125 | if (lru->expire > buf->expire) |
162 | pl->contr->outputs[oldest].count = 1; |
126 | lru = buf; |
163 | pl->contr->outputs[oldest].buf = buf; |
|
|
164 | } |
|
|
165 | } |
127 | } |
|
|
128 | |
|
|
129 | // new message, evoke oldest buffer |
|
|
130 | lru->expire = pticks + pl->outputs_sync; |
|
|
131 | lru->count = pl->outputs_count; |
|
|
132 | lru->len = len; |
|
|
133 | memcpy (lru->msg, msg, len); |
|
|
134 | |
|
|
135 | return false; |
166 | } |
136 | } |
167 | |
137 | |
168 | /** |
138 | /** |
169 | * Sends message to player(s). |
139 | * Sends message to player(s). |
170 | * |
140 | * |
… | |
… | |
179 | * in the flags. |
149 | * in the flags. |
180 | * |
150 | * |
181 | * If message is black, and not NDI_UNIQUE, gets sent through output buffers. |
151 | * If message is black, and not NDI_UNIQUE, gets sent through output buffers. |
182 | * |
152 | * |
183 | */ |
153 | */ |
184 | |
|
|
185 | void |
154 | void |
186 | new_draw_info (int flags, int pri, const object *pl, const char *buf) |
155 | new_draw_info (int flags, int pri, const object *op, const char *buf) |
187 | { |
156 | { |
188 | if (flags & NDI_ALL) |
157 | if (flags & NDI_ALL) |
189 | { |
|
|
190 | for_all_players (pl) |
158 | for_all_players (pl) |
191 | new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); |
159 | new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); |
192 | |
|
|
193 | return; |
|
|
194 | } |
|
|
195 | |
|
|
196 | if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns) |
|
|
197 | return; |
|
|
198 | |
|
|
199 | if (pri >= pl->contr->listening) |
|
|
200 | return; |
|
|
201 | |
|
|
202 | if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) |
|
|
203 | check_output_buffers (pl, buf); |
|
|
204 | else |
160 | else |
|
|
161 | { |
|
|
162 | if (!op || !op->contr || !op->contr->ns) |
|
|
163 | return; |
|
|
164 | |
|
|
165 | if (pri >= op->contr->listening) |
|
|
166 | return; |
|
|
167 | |
|
|
168 | if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK |
|
|
169 | || !op->contr->ns->msg_suppressed (buf)) |
205 | print_message (flags & NDI_COLOR_MASK, pl, buf); |
170 | print_message (flags & NDI_COLOR_MASK, op, buf); |
|
|
171 | } |
206 | } |
172 | } |
207 | |
173 | |
208 | /** |
174 | /** |
209 | * Wrapper for new_draw_info printf-like. |
175 | * Wrapper for new_draw_info printf-like. |
210 | * |
176 | * |
… | |
… | |
293 | */ |
259 | */ |
294 | |
260 | |
295 | void |
261 | void |
296 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
262 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
297 | { |
263 | { |
298 | player *pl; |
|
|
299 | |
|
|
300 | for_all_players (pl) |
264 | for_all_players (pl) |
301 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
265 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
302 | new_draw_info (color, 0, pl->ob, str); |
266 | new_draw_info (color, 0, pl->ob, str); |
303 | } |
267 | } |
304 | |
268 | |
… | |
… | |
307 | */ |
271 | */ |
308 | |
272 | |
309 | void |
273 | void |
310 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
274 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
311 | { |
275 | { |
312 | player *pl; |
|
|
313 | |
|
|
314 | for_all_players (pl) |
276 | for_all_players (pl) |
315 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) |
277 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) |
316 | new_draw_info (color, 0, pl->ob, str); |
278 | new_draw_info (color, 0, pl->ob, str); |
317 | } |
279 | } |
318 | |
280 | |
… | |
… | |
321 | */ |
283 | */ |
322 | |
284 | |
323 | void |
285 | void |
324 | new_info_map (int color, maptile * map, const char *str) |
286 | new_info_map (int color, maptile * map, const char *str) |
325 | { |
287 | { |
326 | player *pl; |
|
|
327 | |
|
|
328 | for_all_players (pl) |
288 | for_all_players (pl) |
329 | if (pl->ob != NULL && pl->ob->map == map) |
289 | if (pl->ob != NULL && pl->ob->map == map) |
330 | new_draw_info (color, 0, pl->ob, str); |
290 | new_draw_info (color, 0, pl->ob, str); |
331 | } |
291 | } |
332 | |
292 | |
… | |
… | |
336 | * to handle this |
296 | * to handle this |
337 | */ |
297 | */ |
338 | void |
298 | void |
339 | clear_win_info (object *op) |
299 | clear_win_info (object *op) |
340 | { |
300 | { |
341 | } |
|
|
342 | |
|
|
343 | /** |
|
|
344 | * Get player's current range attack in obuf. |
|
|
345 | */ |
|
|
346 | void |
|
|
347 | rangetostring (object *pl, char *obuf) |
|
|
348 | { |
|
|
349 | switch (pl->contr->shoottype) |
|
|
350 | { |
|
|
351 | case range_none: |
|
|
352 | strcpy (obuf, "Range: nothing"); |
|
|
353 | break; |
|
|
354 | |
|
|
355 | case range_bow: |
|
|
356 | { |
|
|
357 | object *op; |
|
|
358 | |
|
|
359 | for (op = pl->inv; op; op = op->below) |
|
|
360 | if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) |
|
|
361 | break; |
|
|
362 | |
|
|
363 | if (op == NULL) |
|
|
364 | break; |
|
|
365 | |
|
|
366 | sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); |
|
|
367 | } |
|
|
368 | break; |
|
|
369 | |
|
|
370 | case range_magic: |
|
|
371 | if (settings.casting_time == TRUE) |
|
|
372 | { |
|
|
373 | if (pl->casting_time > -1) |
|
|
374 | { |
|
|
375 | if (pl->casting_time == 0) |
|
|
376 | sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name); |
|
|
377 | else |
|
|
378 | sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name); |
|
|
379 | } |
|
|
380 | else |
|
|
381 | sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); |
|
|
382 | } |
|
|
383 | else |
|
|
384 | sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); |
|
|
385 | break; |
|
|
386 | |
|
|
387 | case range_misc: |
|
|
388 | sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none"); |
|
|
389 | break; |
|
|
390 | |
|
|
391 | /* range_scroll is only used for controlling golems. If the |
|
|
392 | * the player does not have a golem, reset some things. |
|
|
393 | */ |
|
|
394 | case range_golem: |
|
|
395 | if (pl->contr->ranges[range_golem] != NULL) |
|
|
396 | sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); |
|
|
397 | else |
|
|
398 | { |
|
|
399 | pl->contr->shoottype = range_none; |
|
|
400 | strcpy (obuf, "Range: nothing"); |
|
|
401 | } |
|
|
402 | break; |
|
|
403 | |
|
|
404 | case range_skill: |
|
|
405 | sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none"); |
|
|
406 | break; |
|
|
407 | |
|
|
408 | case range_builder: |
|
|
409 | sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0)); |
|
|
410 | break; |
|
|
411 | |
|
|
412 | default: |
|
|
413 | strcpy (obuf, "Range: illegal"); |
|
|
414 | } |
|
|
415 | } |
301 | } |
416 | |
302 | |
417 | /** |
303 | /** |
418 | * Sets player title. |
304 | * Sets player title. |
419 | */ |
305 | */ |
… | |
… | |
425 | sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); |
311 | sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); |
426 | else |
312 | else |
427 | sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); |
313 | sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); |
428 | } |
314 | } |
429 | |
315 | |
|
|
316 | // formerly a macro, used only by magic map, so optimised it out |
|
|
317 | static inline faceidx |
|
|
318 | GET_MAP_FACE (maptile *m, int x, int y, int layer) |
|
|
319 | { |
|
|
320 | if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) |
|
|
321 | return op->face; |
|
|
322 | else |
|
|
323 | return 0; |
|
|
324 | } |
430 | |
325 | |
431 | /** |
326 | /** |
432 | * Helper for magic map creation. |
327 | * Helper for magic map creation. |
433 | * |
328 | * |
434 | * Takes a player, the map_mark array and an x and y starting position. |
329 | * Takes a player, the map_mark array and an x and y starting position. |
… | |
… | |
443 | magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) |
338 | magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) |
444 | { |
339 | { |
445 | int x, y, dx, dy, mflags; |
340 | int x, y, dx, dy, mflags; |
446 | sint16 nx, ny; |
341 | sint16 nx, ny; |
447 | maptile *mp; |
342 | maptile *mp; |
448 | New_Face *f; |
|
|
449 | |
343 | |
450 | for (dx = -1; dx <= 1; dx++) |
344 | for (dx = -1; dx <= 1; dx++) |
451 | { |
345 | { |
452 | for (dy = -1; dy <= 1; dy++) |
346 | for (dy = -1; dy <= 1; dy++) |
453 | { |
347 | { |
… | |
… | |
465 | if (mflags & P_OUT_OF_MAP) |
359 | if (mflags & P_OUT_OF_MAP) |
466 | continue; |
360 | continue; |
467 | |
361 | |
468 | if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) |
362 | if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) |
469 | { |
363 | { |
470 | f = GET_MAP_FACE (mp, nx, ny, 0); |
364 | int f = GET_MAP_FACE (mp, nx, ny, 0); |
471 | if (f == blank_face) |
365 | if (f == blank_face) |
|
|
366 | { |
472 | f = GET_MAP_FACE (mp, nx, ny, 1); |
367 | f = GET_MAP_FACE (mp, nx, ny, 1); |
473 | if (f == blank_face) |
368 | if (f == blank_face) |
474 | f = GET_MAP_FACE (mp, nx, ny, 2); |
369 | f = GET_MAP_FACE (mp, nx, ny, 2); |
|
|
370 | } |
|
|
371 | |
|
|
372 | int magicmap = faces [f].magicmap; |
475 | |
373 | |
476 | /* Should probably have P_NO_MAGIC here also, but then shops don't |
374 | /* Should probably have P_NO_MAGIC here also, but then shops don't |
477 | * work. |
375 | * work. |
478 | */ |
376 | */ |
479 | if (mflags & P_BLOCKSVIEW) |
377 | if (mflags & P_BLOCKSVIEW) |
480 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); |
378 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap; |
481 | else |
379 | else |
482 | { |
380 | { |
483 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); |
381 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap; |
484 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
382 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
485 | } |
383 | } |
486 | } |
384 | } |
487 | } |
385 | } |
488 | } |
386 | } |
489 | } |
387 | } |
490 | |
|
|
491 | |
388 | |
492 | /** |
389 | /** |
493 | * Creates magic map for player. |
390 | * Creates magic map for player. |
494 | * |
391 | * |
495 | * Note: For improved magic mapping display, the space that blocks |
392 | * Note: For improved magic mapping display, the space that blocks |
… | |
… | |
502 | * is for open spaces. map_mark should already have been initialised |
399 | * is for open spaces. map_mark should already have been initialised |
503 | * to zero before this is called. |
400 | * to zero before this is called. |
504 | * strength is an initial strength*2 rectangular area that we automatically |
401 | * strength is an initial strength*2 rectangular area that we automatically |
505 | * see in/penetrate through. |
402 | * see in/penetrate through. |
506 | */ |
403 | */ |
507 | |
|
|
508 | void |
404 | void |
509 | magic_mapping_mark (object *pl, char *map_mark, int strength) |
405 | magic_mapping_mark (object *pl, char *map_mark, int strength) |
510 | { |
406 | { |
511 | int x, y, mflags; |
407 | int x, y, mflags; |
512 | sint16 nx, ny; |
408 | sint16 nx, ny; |
513 | maptile *mp; |
409 | maptile *mp; |
514 | New_Face *f; |
|
|
515 | |
410 | |
516 | for (x = -strength; x < strength; x++) |
411 | for (x = -strength; x < strength; x++) |
517 | { |
412 | { |
518 | for (y = -strength; y < strength; y++) |
413 | for (y = -strength; y < strength; y++) |
519 | { |
414 | { |
520 | mp = pl->map; |
415 | mp = pl->map; |
521 | nx = pl->x + x; |
416 | nx = pl->x + x; |
522 | ny = pl->y + y; |
417 | ny = pl->y + y; |
|
|
418 | |
523 | mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); |
419 | mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); |
524 | if (mflags & P_OUT_OF_MAP) |
420 | if (mflags & P_OUT_OF_MAP) |
525 | continue; |
421 | continue; |
526 | else |
422 | |
|
|
423 | int f = GET_MAP_FACE (mp, nx, ny, 0); |
|
|
424 | if (f == blank_face) |
527 | { |
425 | { |
528 | f = GET_MAP_FACE (mp, nx, ny, 0); |
|
|
529 | if (f == blank_face) |
|
|
530 | f = GET_MAP_FACE (mp, nx, ny, 1); |
426 | f = GET_MAP_FACE (mp, nx, ny, 1); |
531 | if (f == blank_face) |
427 | if (f == blank_face) |
532 | f = GET_MAP_FACE (mp, nx, ny, 2); |
428 | f = GET_MAP_FACE (mp, nx, ny, 2); |
533 | } |
429 | } |
534 | |
430 | |
|
|
431 | int magicmap = faces [f].magicmap; |
|
|
432 | |
535 | if (mflags & P_BLOCKSVIEW) |
433 | if (mflags & P_BLOCKSVIEW) |
536 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); |
434 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap; |
537 | else |
435 | else |
538 | { |
436 | { |
539 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); |
437 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap; |
540 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
438 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
541 | } |
439 | } |
542 | } |
440 | } |
543 | } |
441 | } |
544 | } |
442 | } |