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.36 by root, Mon Mar 12 01:13:10 2007 UTC vs.
Revision 1.56 by root, Fri Nov 6 13:07:28 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
233 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 192 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
234 return;
235
236 if (pri >= pl->contr->listening)
237 return; 193 return;
238 194
239 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) 195 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
240 { 196 {
241 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 197 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
… …
255} 211}
256 212
257void 213void
258draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 214draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
259{ 215{
260 char buf[HUGE_BUF]; 216 va_list ap;
217 va_start (ap, new_format);
261 218
262 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 219 if (!pl || !pl->is_player ())
263 return; 220 return;
264 221
265 if (pri >= pl->contr->listening) 222 // TODO: just assume, and rip out?
266 return;
267
268 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) 223 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
269 { 224 {
270 va_list ap;
271
272 LOG (llevDebug, "Non supported extension text type for client.\n"); 225 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); 226 new_draw_info (flags, pri, pl, vformat (old_format, ap));
277 return;
278 } 227 }
279 else 228 else
280 { 229 {
281 va_list ap; 230 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); 231 strip_media_tag (buf);
287 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf); 232 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
288 } 233 }
234
235 va_end (ap);
289} 236}
290 237
291/** 238/**
292 * Writes to everyone on the map *except* op. This is useful for emotions. 239 * Writes to everyone on the map *except* op. This is useful for emotions.
293 */ 240 */
294
295void 241void
296new_info_map_except (int color, maptile * map, object *op, const char *str) 242new_info_map_except (int color, maptile * map, object *op, const char *str)
297{ 243{
298 for_all_players (pl) 244 for_all_players (pl)
299 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 245 if (pl->ob->map == map && pl->ob != op)
300 new_draw_info (color, 0, pl->ob, str); 246 new_draw_info (color, 0, pl->ob, str);
301} 247}
302 248
303/** 249/**
304 * Writes to everyone on the map except op1 and op2 250 * Writes to everyone on the map except op1 and op2
305 */ 251 */
306 252static void
307void
308new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 253new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
309{ 254{
310 for_all_players (pl) 255 for_all_players (pl)
311 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 256 if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
312 new_draw_info (color, 0, pl->ob, str); 257 new_draw_info (color, 0, pl->ob, str);
313} 258}
314 259
315/** 260/**
316 * Writes to everyone on the specified map 261 * Writes to everyone on the specified map
317 */ 262 */
318
319void 263void
320new_info_map (int color, maptile * map, const char *str) 264new_info_map (int color, maptile * map, const char *str)
321{ 265{
322 for_all_players (pl) 266 for_all_players (pl)
323 if (pl->ob != NULL && pl->ob->map == map) 267 if (pl->ob->map == map)
324 new_draw_info (color, 0, pl->ob, str); 268 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} 269}
410 270
411/** 271/**
412 * Sets player title. 272 * Sets player title.
413 */ 273 */
… …
421 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 281 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
422} 282}
423 283
424// formerly a macro, used only by magic map, so optimised it out 284// formerly a macro, used only by magic map, so optimised it out
425static inline faceidx 285static inline faceidx
426GET_MAP_FACE (maptile *m, int x, int y, int layer) 286GET_MAP_FACE (mapspace &ms, int layer)
427{ 287{
428 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) 288 if (object *op = ms.faces_obj [layer])
429 return op->face; 289 return op->face;
430 else 290 else
431 return 0; 291 return 0;
432} 292}
433 293
… …
443 * for various code values. 303 * for various code values.
444 */ 304 */
445static void 305static void
446magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 306magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
447{ 307{
448 int x, y, dx, dy, mflags;
449 sint16 nx, ny;
450 maptile *mp;
451
452 for (dx = -1; dx <= 1; dx++) 308 for (int dx = -1; dx <= 1; dx++)
453 { 309 {
454 for (dy = -1; dy <= 1; dy++) 310 for (int dy = -1; dy <= 1; dy++)
455 { 311 {
456 x = px + dx; 312 int x = px + dx;
457 y = py + dy; 313 int y = py + dy;
458 314
459 if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF) 315 if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF)
460 continue; 316 continue;
461 317
462 mp = pl->map; 318 mapxy pos (pl);
463 nx = pl->x + x; 319 pos.move (x, y);
464 ny = pl->y + y;
465 320
466 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 321 if (!pos.normalise ())
467 if (mflags & P_OUT_OF_MAP)
468 continue; 322 continue;
323
324 mapspace &ms = pos.ms ();
469 325
470 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 326 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
471 { 327 {
328 int mflags = ms.flags ();
329
472 int f = GET_MAP_FACE (mp, nx, ny, 0); 330 int f = GET_MAP_FACE (ms, 0);
473 if (f == blank_face) 331 if (f == blank_face)
474 { 332 {
475 f = GET_MAP_FACE (mp, nx, ny, 1); 333 f = GET_MAP_FACE (ms, 1);
476 if (f == blank_face) 334 if (f == blank_face)
477 f = GET_MAP_FACE (mp, nx, ny, 2); 335 f = GET_MAP_FACE (ms, 2);
478 } 336 }
479 337
480 int magicmap = faces [f].magicmap; 338 int magicmap = faces [f].magicmap;
481 339
482 /* Should probably have P_NO_MAGIC here also, but then shops don't 340 /* Should probably have P_NO_MAGIC here also, but then shops don't
… …
495} 353}
496 354
497/** 355/**
498 * Creates magic map for player. 356 * Creates magic map for player.
499 * 357 *
500 * Note: For improved magic mapping display, the space that blocks 358 * Note: For improved magic mapping display, the space that blocks
501 * the view is now marked with value 2. Any dependencies of map_mark 359 * the view is now marked with value 2. Any dependencies of map_mark
502 * being nonzero have been changed to check for 1. Also, since 360 * being nonzero have been changed to check for 1. Also, since
503 * map_mark is a char value, putting 2 in should cause no problems. 361 * map_mark is a char value, putting 2 in should cause no problems.
504 * 362 *
505 * This function examines the map the player is on, and determines what 363 * This function examines the map the player is on, and determines what
506 * is visible. 2 is set for walls or objects that blocks view. 1 364 * is visible. 2 is set for walls or objects that blocks view. 1
507 * is for open spaces. map_mark should already have been initialised 365 * is for open spaces. map_mark should already have been initialised
508 * to zero before this is called. 366 * to zero before this is called.
509 * strength is an initial strength*2 rectangular area that we automatically 367 * strength is an initial strength*2 rectangular area that we automatically
510 * see in/penetrate through. 368 * see in/penetrate through.
511 */ 369 */
512void 370static void
513magic_mapping_mark (object *pl, char *map_mark, int strength) 371magic_mapping_mark (object *pl, char *map_mark, int strength)
514{ 372{
515 int x, y, mflags;
516 sint16 nx, ny;
517 maptile *mp;
518
519 for (x = -strength; x < strength; x++) 373 for (int x = -strength; x < strength; x++)
520 { 374 {
521 for (y = -strength; y < strength; y++) 375 for (int y = -strength; y < strength; y++)
522 { 376 {
523 mp = pl->map; 377 mapxy pos (pl);
524 nx = pl->x + x; 378 pos.move (x, y);
525 ny = pl->y + y;
526 379
527 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 380 if (!pos.normalise ())
528 if (mflags & P_OUT_OF_MAP)
529 continue; 381 continue;
530 382
383 mapspace &ms = pos.ms ();
384
385 int mflags = ms.flags ();
386
531 int f = GET_MAP_FACE (mp, nx, ny, 0); 387 int f = GET_MAP_FACE (ms, 0);
532 if (f == blank_face) 388 if (f == blank_face)
533 { 389 {
534 f = GET_MAP_FACE (mp, nx, ny, 1); 390 f = GET_MAP_FACE (ms, 1);
535 if (f == blank_face) 391 if (f == blank_face)
536 f = GET_MAP_FACE (mp, nx, ny, 2); 392 f = GET_MAP_FACE (ms, 2);
537 } 393 }
538 394
539 int magicmap = faces [f].magicmap; 395 int magicmap = faces [f].magicmap;
540 396
541 if (mflags & P_BLOCKSVIEW) 397 if (mflags & P_BLOCKSVIEW)
… …
603 pl->contr->ns->send_packet (sl); 459 pl->contr->ns->send_packet (sl);
604 460
605 free (map_mark); 461 free (map_mark);
606} 462}
607 463
608/**
609 * Send a kill log record to sockets
610 */
611void
612Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
613{
614 size_t len;
615 char buf[MAX_BUF];
616
617 if (With != NULL)
618 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
619 else
620 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
621
622 len = strlen (buf);
623}
624

Diff Legend

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