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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.34 by pippijn, Thu Mar 1 12:28:17 2007 UTC vs.
Revision 1.53 by root, Thu Oct 15 21:09:32 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Basic client output functions. 27 * Basic client output functions.
… …
36#include <sproto.h> 36#include <sproto.h>
37#include <stdarg.h> 37#include <stdarg.h>
38#include <spells.h> 38#include <spells.h>
39#include <skills.h> 39#include <skills.h>
40 40
41#include <cstring>
42
41/** 43/**
42 * Draws a normal message on the client. It is pretty 44 * Draws a normal message on the client. It is pretty
43 * much the same thing as the draw_info above, but takes a color 45 * much the same thing as the draw_info above, but takes a color
44 * parameter. the esrv_drawinfo functions should probably be 46 * parameter. the esrv_drawinfo functions should probably be
45 * replaced with this, just using black as the color. 47 * replaced with this, just using black as the color.
46 */ 48 */
47static void 49static void
48esrv_print_msg (client *ns, int color, const char *str) 50esrv_print_msg (client *ns, int color, const char *str)
49{ 51{
50 ns->send_packet_printf ("drawinfo %d %s", color, str); 52 ns->send_msg (color, "info", str);
51} 53}
52 54
53/** 55/**
54 * Draws an extended message on the client. 56 * Draws an extended message on the client.
55 * ns the socket to send message to 57 * ns the socket to send message to
… …
60 * message The main message 62 * message The main message
61 */ 63 */
62static void 64static void
63esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message) 65esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
64{ 66{
65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 67 ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
66} 68}
67 69
68/** 70/**
69 * Frontend for esrv_print_msg 71 * Frontend for esrv_print_msg
70 * \param colr message color 72 * \param colr message color
… …
83 85
84 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 86 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
85 return; 87 return;
86 88
87 if (pl->type == PLAYER) 89 if (pl->type == PLAYER)
88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp); 90 esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
89} 91}
90 92
91/** 93bool
92 * Prints out the contents of specified buffer structures, 94client::msg_suppressed (const char *msg)
93 * and clears the string.
94 */
95void
96flush_output_element (const object *pl, Output_Buf * outputs)
97{ 95{
98 char tbuf[MAX_BUF]; 96 if (!pl)
99
100 if (outputs->buf == NULL)
101 return; 97 return false;
102 if (outputs->count > 1) 98
103 { 99 if (pl->outputs_count <= 1 || !pl->outputs_sync)
104 snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf); 100 return false;
105 print_message (NDI_BLACK, pl, tbuf); 101
102 int len = strlen (msg);
103
104 if (len > MSG_BUF_SIZE)
105 return false;
106
107 msg_buf *lru = msgbuf;
108 for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf)
106 } 109 {
107 else 110 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 */
128static void
129check_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 { 111 {
142 if (pl->contr->outputs[i].buf && !strcmp (buf, pl->contr->outputs[i].buf)) 112 // found matching buf, see if expired
113 if (buf->expire <= pticks || !buf->count)
143 break; 114 {
144 else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) 115 // yes, take over matching buffer, print
145 oldest = i; 116 buf->expire = pticks + pl->outputs_sync;
117 buf->count = pl->outputs_count;
118
119 return false;
120 }
121
122 // no, suppress
123 --buf->count;
124 return true;
146 } 125 }
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 126
161 pl->contr->outputs[oldest].first_update = pticks; 127 if (lru->expire > buf->expire)
162 pl->contr->outputs[oldest].count = 1; 128 lru = buf;
163 pl->contr->outputs[oldest].buf = buf;
164 }
165 } 129 }
130
131 // new message, evoke oldest buffer
132 lru->expire = pticks + pl->outputs_sync;
133 lru->count = pl->outputs_count;
134 lru->len = len;
135 memcpy (lru->msg, msg, len);
136
137 return false;
166} 138}
167 139
168/** 140/**
169 * Sends message to player(s). 141 * Sends message to player(s).
170 * 142 *
171 * flags is various flags - mostly color, plus a few specials. 143 * flags is various flags - mostly color, plus a few specials.
172 * 144 *
173 * pri is priority. It is a little odd - the lower the value, the more 145 * pri is unused.
174 * important it is. Thus, 0 gets sent no matter what. Otherwise, the
175 * value must be less than the listening level that the player has set.
176 * Unfortunately, there is no clear guideline on what each level does what.
177 * 146 *
178 * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set 147 * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set
179 * in the flags. 148 * in the flags.
180 * 149 *
181 * If message is black, and not NDI_UNIQUE, gets sent through output buffers. 150 * If message is black, and not NDI_UNIQUE, gets sent through output buffers.
182 * 151 *
183 */ 152 */
184
185void 153void
186new_draw_info (int flags, int pri, const object *pl, const char *buf) 154new_draw_info (int flags, int pri, const object *op, const char *buf)
187{ 155{
188 if (flags & NDI_ALL) 156 if (flags & NDI_ALL)
189 { 157 {
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, 0, pl->ob, buf);
192
193 return;
194 } 160 }
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 161 else
162 {
163 if (!op || !op->contr || !op->contr->ns)
164 return;
165
166 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
167 || !op->contr->ns->msg_suppressed (buf))
205 print_message (flags & NDI_COLOR_MASK, pl, buf); 168 print_message (flags & NDI_COLOR_MASK, op, buf);
169 }
206} 170}
207 171
208/** 172/**
209 * Wrapper for new_draw_info printf-like. 173 * Wrapper for new_draw_info printf-like.
210 * 174 *
… …
214 * client/server bandwidth (client could keep track of various strings 178 * client/server bandwidth (client could keep track of various strings
215 */ 179 */
216void 180void
217new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 181new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
218{ 182{
219 char buf[HUGE_BUF];
220
221 va_list ap; 183 va_list ap;
222 va_start (ap, format); 184 va_start (ap, format);
223 vsnprintf (buf, HUGE_BUF, format, ap); 185 new_draw_info (flags, pri, pl, vformat (format, ap));
224 va_end (ap); 186 va_end (ap);
225
226 new_draw_info (flags, pri, pl, buf);
227} 187}
228 188
229void 189void
230draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) 190draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
231{ 191{
232 192
233 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 193 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
234 return;
235
236 if (pri >= pl->contr->listening)
237 return; 194 return;
238 195
239 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) 196 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
240 { 197 {
241 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 198 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
… …
255} 212}
256 213
257void 214void
258draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 215draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
259{ 216{
260 char buf[HUGE_BUF]; 217 va_list ap;
218 va_start (ap, new_format);
261 219
262 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 220 if (!pl || !pl->is_player ())
263 return; 221 return;
264 222
265 if (pri >= pl->contr->listening) 223 // TODO: just assume, and rip out?
266 return;
267
268 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) 224 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
269 { 225 {
270 va_list ap;
271
272 LOG (llevDebug, "Non supported extension text type for client.\n"); 226 LOG (llevDebug, "Non supported extension text type for client.\n");
273 va_start (ap, new_format);
274 vsnprintf (buf, HUGE_BUF, old_format, ap);
275 va_end (ap);
276 new_draw_info (flags, pri, pl, buf); 227 new_draw_info (flags, pri, pl, vformat (old_format, ap));
277 return;
278 } 228 }
279 else 229 else
280 { 230 {
281 va_list ap; 231 char *buf = vformat (new_format, ap);
282
283 va_start (ap, new_format);
284 vsnprintf (buf, HUGE_BUF, new_format, ap);
285 va_end (ap);
286 strip_media_tag (buf); 232 strip_media_tag (buf);
287 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf); 233 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
288 } 234 }
235
236 va_end (ap);
289} 237}
290 238
291/** 239/**
292 * Writes to everyone on the map *except* op. This is useful for emotions. 240 * Writes to everyone on the map *except* op. This is useful for emotions.
293 */ 241 */
294 242
295void 243void
296new_info_map_except (int color, maptile * map, object *op, const char *str) 244new_info_map_except (int color, maptile * map, object *op, const char *str)
297{ 245{
298 for_all_players (pl) 246 for_all_players (pl)
299 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 247 if (pl->ob->map == map && pl->ob != op)
300 new_draw_info (color, 0, pl->ob, str); 248 new_draw_info (color, 0, pl->ob, str);
301} 249}
302 250
303/** 251/**
304 * Writes to everyone on the map except op1 and op2 252 * Writes to everyone on the map except op1 and op2
305 */ 253 */
306
307void 254void
308new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 255new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
309{ 256{
310 for_all_players (pl) 257 for_all_players (pl)
311 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 258 if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
312 new_draw_info (color, 0, pl->ob, str); 259 new_draw_info (color, 0, pl->ob, str);
313} 260}
314 261
315/** 262/**
316 * Writes to everyone on the specified map 263 * Writes to everyone on the specified map
317 */ 264 */
318
319void 265void
320new_info_map (int color, maptile * map, const char *str) 266new_info_map (int color, maptile * map, const char *str)
321{ 267{
322 for_all_players (pl) 268 for_all_players (pl)
323 if (pl->ob != NULL && pl->ob->map == map) 269 if (pl->ob->map == map)
324 new_draw_info (color, 0, pl->ob, str); 270 new_draw_info (color, 0, pl->ob, str);
325}
326
327/**
328 * This does nothing now. However, in theory, we should probably send
329 * something to the client and let the client figure out how it might want
330 * to handle this
331 */
332void
333clear_win_info (object *op)
334{
335}
336
337/**
338 * Get player's current range attack in obuf.
339 */
340void
341rangetostring (object *pl, char *obuf)
342{
343 switch (pl->contr->shoottype)
344 {
345 case range_none:
346 strcpy (obuf, "Range: nothing");
347 break;
348
349 case range_bow:
350 {
351 object *op;
352
353 for (op = pl->inv; op; op = op->below)
354 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
355 break;
356
357 if (op == NULL)
358 break;
359
360 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
361 }
362 break;
363
364 case range_magic:
365 if (settings.casting_time == TRUE)
366 {
367 if (pl->casting_time > -1)
368 {
369 if (pl->casting_time == 0)
370 sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
371 else
372 sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
373 }
374 else
375 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
376 }
377 else
378 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
379 break;
380
381 case range_misc:
382 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
383 break;
384
385 /* range_scroll is only used for controlling golems. If the
386 * the player does not have a golem, reset some things.
387 */
388 case range_golem:
389 if (pl->contr->ranges[range_golem] != NULL)
390 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
391 else
392 {
393 pl->contr->shoottype = range_none;
394 strcpy (obuf, "Range: nothing");
395 }
396 break;
397
398 case range_skill:
399 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
400 break;
401
402 case range_builder:
403 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
404 break;
405
406 default:
407 strcpy (obuf, "Range: illegal");
408 }
409} 271}
410 272
411/** 273/**
412 * Sets player title. 274 * Sets player title.
413 */ 275 */
… …
419 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); 281 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
420 else 282 else
421 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 283 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
422} 284}
423 285
286// formerly a macro, used only by magic map, so optimised it out
287static inline faceidx
288GET_MAP_FACE (maptile *m, int x, int y, int layer)
289{
290 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))
291 return op->face;
292 else
293 return 0;
294}
424 295
425/** 296/**
426 * Helper for magic map creation. 297 * Helper for magic map creation.
427 * 298 *
428 * Takes a player, the map_mark array and an x and y starting position. 299 * Takes a player, the map_mark array and an x and y starting position.
… …
437magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 308magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
438{ 309{
439 int x, y, dx, dy, mflags; 310 int x, y, dx, dy, mflags;
440 sint16 nx, ny; 311 sint16 nx, ny;
441 maptile *mp; 312 maptile *mp;
442 facetile *f;
443 313
444 for (dx = -1; dx <= 1; dx++) 314 for (dx = -1; dx <= 1; dx++)
445 { 315 {
446 for (dy = -1; dy <= 1; dy++) 316 for (dy = -1; dy <= 1; dy++)
447 { 317 {
… …
459 if (mflags & P_OUT_OF_MAP) 329 if (mflags & P_OUT_OF_MAP)
460 continue; 330 continue;
461 331
462 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 332 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
463 { 333 {
464 f = GET_MAP_FACE (mp, nx, ny, 0); 334 int f = GET_MAP_FACE (mp, nx, ny, 0);
465 if (f == blank_face) 335 if (f == blank_face)
336 {
466 f = GET_MAP_FACE (mp, nx, ny, 1); 337 f = GET_MAP_FACE (mp, nx, ny, 1);
467 if (f == blank_face) 338 if (f == blank_face)
468 f = GET_MAP_FACE (mp, nx, ny, 2); 339 f = GET_MAP_FACE (mp, nx, ny, 2);
340 }
341
342 int magicmap = faces [f].magicmap;
469 343
470 /* Should probably have P_NO_MAGIC here also, but then shops don't 344 /* Should probably have P_NO_MAGIC here also, but then shops don't
471 * work. 345 * work.
472 */ 346 */
473 if (mflags & P_BLOCKSVIEW) 347 if (mflags & P_BLOCKSVIEW)
474 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 348 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
475 else 349 else
476 { 350 {
477 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 351 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
478 magic_mapping_mark_recursive (pl, map_mark, x, y); 352 magic_mapping_mark_recursive (pl, map_mark, x, y);
479 } 353 }
480 } 354 }
481 } 355 }
482 } 356 }
483} 357}
484
485 358
486/** 359/**
487 * Creates magic map for player. 360 * Creates magic map for player.
488 * 361 *
489 * Note: For improved magic mapping display, the space that blocks 362 * Note: For improved magic mapping display, the space that blocks
… …
496 * is for open spaces. map_mark should already have been initialised 369 * is for open spaces. map_mark should already have been initialised
497 * to zero before this is called. 370 * to zero before this is called.
498 * strength is an initial strength*2 rectangular area that we automatically 371 * strength is an initial strength*2 rectangular area that we automatically
499 * see in/penetrate through. 372 * see in/penetrate through.
500 */ 373 */
501
502void 374void
503magic_mapping_mark (object *pl, char *map_mark, int strength) 375magic_mapping_mark (object *pl, char *map_mark, int strength)
504{ 376{
505 int x, y, mflags; 377 int x, y, mflags;
506 sint16 nx, ny; 378 sint16 nx, ny;
507 maptile *mp; 379 maptile *mp;
508 facetile *f;
509 380
510 for (x = -strength; x < strength; x++) 381 for (x = -strength; x < strength; x++)
511 { 382 {
512 for (y = -strength; y < strength; y++) 383 for (y = -strength; y < strength; y++)
513 { 384 {
514 mp = pl->map; 385 mp = pl->map;
515 nx = pl->x + x; 386 nx = pl->x + x;
516 ny = pl->y + y; 387 ny = pl->y + y;
388
517 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 389 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
518 if (mflags & P_OUT_OF_MAP) 390 if (mflags & P_OUT_OF_MAP)
519 continue; 391 continue;
520 else 392
393 int f = GET_MAP_FACE (mp, nx, ny, 0);
394 if (f == blank_face)
521 { 395 {
522 f = GET_MAP_FACE (mp, nx, ny, 0);
523 if (f == blank_face)
524 f = GET_MAP_FACE (mp, nx, ny, 1); 396 f = GET_MAP_FACE (mp, nx, ny, 1);
525 if (f == blank_face) 397 if (f == blank_face)
526 f = GET_MAP_FACE (mp, nx, ny, 2); 398 f = GET_MAP_FACE (mp, nx, ny, 2);
527 } 399 }
528 400
401 int magicmap = faces [f].magicmap;
402
529 if (mflags & P_BLOCKSVIEW) 403 if (mflags & P_BLOCKSVIEW)
530 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 404 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
531 else 405 else
532 { 406 {
533 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 407 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
534 magic_mapping_mark_recursive (pl, map_mark, x, y); 408 magic_mapping_mark_recursive (pl, map_mark, x, y);
535 } 409 }
536 } 410 }
537 } 411 }
538} 412}
… …
591 pl->contr->ns->send_packet (sl); 465 pl->contr->ns->send_packet (sl);
592 466
593 free (map_mark); 467 free (map_mark);
594} 468}
595 469
596/**
597 * Send a kill log record to sockets
598 */
599void
600Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
601{
602 size_t len;
603 char buf[MAX_BUF];
604
605 if (With != NULL)
606 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
607 else
608 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
609
610 len = strlen (buf);
611}
612

Diff Legend

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