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.9 by root, Tue Sep 19 10:12:41 2006 UTC vs.
Revision 1.35 by root, Sun Mar 11 02:12:45 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
4 3 *
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 *
… …
43 * much the same thing as the draw_info above, but takes a color 43 * much the same thing as the draw_info above, but takes a color
44 * parameter. the esrv_drawinfo functions should probably be 44 * parameter. the esrv_drawinfo functions should probably be
45 * replaced with this, just using black as the color. 45 * replaced with this, just using black as the color.
46 */ 46 */
47static void 47static void
48esrv_print_msg (NewSocket * ns, int color, const char *str) 48esrv_print_msg (client *ns, int color, const char *str)
49{ 49{
50 char buf[HUGE_BUF]; 50 ns->send_packet_printf ("drawinfo %d %s", color, str);
51
52 if (ns->status == Ns_Old)
53 {
54 snprintf (buf, HUGE_BUF, "%s\n", str);
55 }
56 else
57 {
58 snprintf (buf, HUGE_BUF, "drawinfo %d %s", color, str);
59 }
60
61/* LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/
62 Write_String_To_Socket (ns, buf, strlen (buf));
63} 51}
64 52
65/** 53/**
66 * Draws an extended message on the client. 54 * Draws an extended message on the client.
67 * ns the socket to send message to 55 * ns the socket to send message to
… …
70 * subtype type and subtype of text message 58 * subtype type and subtype of text message
71 * intro Intro message to send with main message if client does not support the message type 59 * intro Intro message to send with main message if client does not support the message type
72 * message The main message 60 * message The main message
73 */ 61 */
74static void 62static void
75esrv_print_ext_msg (NewSocket * ns, int color, uint8 type, uint8 subtype, const char *message) 63esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
76{ 64{
77 char buf[HUGE_BUF];
78
79 snprintf (buf, HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
80 Write_String_To_Socket (ns, buf, strlen (buf));
81
82/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
83
84} 66}
85 67
86/** 68/**
87 * Frontend for esrv_print_msg 69 * Frontend for esrv_print_msg
88 * \param colr message color 70 * \param colr message color
… …
91 * 73 *
92 * If pl is NULL or without contr set, writes message to log. 74 * If pl is NULL or without contr set, writes message to log.
93 * 75 *
94 * Else sends message to player via esrv_print_msg 76 * Else sends message to player via esrv_print_msg
95 */ 77 */
96
97static void 78static void
98print_message (int colr, const object *pl, const char *tmp) 79print_message (int colr, const object *pl, const char *tmp)
99{ 80{
100 81 if (!tmp)
101 if (tmp == (char *) NULL)
102 {
103 tmp = "[NULL]"; 82 tmp = "[NULL]";
104 }
105 83
106 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
107 return; 85 return;
108 86
109 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
110 {
111 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
112 return;
113 }
114} 89}
115
116 90
117/** 91/**
118 * Prints out the contents of specified buffer structures, 92 * Prints out the contents of specified buffer structures,
119 * and clears the string. 93 * and clears the string.
120 */ 94 */
121
122void 95void
123flush_output_element (const object *pl, Output_Buf * outputs) 96flush_output_element (const object *pl, Output_Buf * outputs)
124{ 97{
125 char tbuf[MAX_BUF]; 98 char tbuf[MAX_BUF];
126 99
… …
150 * If found, checks if message should be sent now. 123 * If found, checks if message should be sent now.
151 * 124 *
152 * If message not already in buffers, flushes olders buffer, 125 * If message not already in buffers, flushes olders buffer,
153 * and adds message to queue. 126 * and adds message to queue.
154 */ 127 */
155
156static void 128static void
157check_output_buffers (const object *pl, const char *buf) 129check_output_buffers (const object *pl, const char *buf)
158{ 130{
159 int i, oldest = 0; 131 int i, oldest = 0;
160 132
… …
191 pl->contr->outputs[oldest].buf = buf; 163 pl->contr->outputs[oldest].buf = buf;
192 } 164 }
193 } 165 }
194} 166}
195 167
196
197
198/** 168/**
199 * Sends message to player(s). 169 * Sends message to player(s).
200 * 170 *
201 * flags is various flags - mostly color, plus a few specials. 171 * flags is various flags - mostly color, plus a few specials.
202 * 172 *
… …
213 */ 183 */
214 184
215void 185void
216new_draw_info (int flags, int pri, const object *pl, const char *buf) 186new_draw_info (int flags, int pri, const object *pl, const char *buf)
217{ 187{
218
219 if (flags & NDI_ALL) 188 if (flags & NDI_ALL)
220 { 189 {
221 player *tmppl; 190 for_all_players (pl)
222 int i;
223
224 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
225 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 191 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
226
227 for (i = 1; i < socket_info.allocated_sockets; i++)
228 {
229 if (init_sockets[i].status == Ns_Old && init_sockets[i].old_mode != Old_Listen && pri < 10)
230 {
231 cs_write_string (&init_sockets[i], buf, strlen (buf));
232 /* Most messages don't have a newline, so add one */
233 cs_write_string (&init_sockets[i], "\n", 1);
234 }
235 }
236 192
237 return; 193 return;
238 } 194 }
239 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 195
240 { 196 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
241 /* Write to the socket? */
242 print_message (0, NULL, buf);
243 return; 197 return;
244 } 198
245 if (pl->type != PLAYER)
246 return;
247 if (pri >= pl->contr->listening) 199 if (pri >= pl->contr->listening)
248 return; 200 return;
249 201
250 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 202 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
251 {
252 /* following prints stuff out, as appropriate */
253 check_output_buffers (pl, buf); 203 check_output_buffers (pl, buf);
254 }
255 else 204 else
256 {
257 print_message (flags & NDI_COLOR_MASK, pl, buf); 205 print_message (flags & NDI_COLOR_MASK, pl, buf);
258 }
259} 206}
260 207
261/** 208/**
262 * Wrapper for new_draw_info printf-like. 209 * Wrapper for new_draw_info printf-like.
263 * 210 *
264 * This is a pretty trivial function, but it allows us to use printf style 211 * This is a pretty trivial function, but it allows us to use printf style
265 * formatting, so instead of the calling function having to do it, we do 212 * formatting, so instead of the calling function having to do it, we do
266 * it here. It may also have advantages in the future for reduction of 213 * it here. It may also have advantages in the future for reduction of
267 * client/server bandwidth (client could keep track of various strings 214 * client/server bandwidth (client could keep track of various strings
268 */ 215 */
269
270void 216void
271new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 217new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
272{ 218{
273 char buf[HUGE_BUF]; 219 char buf[HUGE_BUF];
274 220
275 va_list ap; 221 va_list ap;
276
277 va_start (ap, format); 222 va_start (ap, format);
278
279 vsnprintf (buf, HUGE_BUF, format, ap); 223 vsnprintf (buf, HUGE_BUF, format, ap);
280
281 va_end (ap); 224 va_end (ap);
282 225
283 new_draw_info (flags, pri, pl, buf); 226 new_draw_info (flags, pri, pl, buf);
284} 227}
285 228
286
287void 229void
288draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) 230draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
289{ 231{
290 232
291 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 233 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
292 return; 234 return;
293 235
294 if (pri >= pl->contr->listening) 236 if (pri >= pl->contr->listening)
295 return; 237 return;
238
296 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 239 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
297 { 240 {
298 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 241 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
299 242
300 if (buf == NULL) 243 if (buf == NULL)
301 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 244 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
306 new_draw_info (flags, pri, pl, buf); 249 new_draw_info (flags, pri, pl, buf);
307 free (buf); 250 free (buf);
308 } 251 }
309 } 252 }
310 else 253 else
311 {
312 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message); 254 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
313 }
314} 255}
315 256
316void 257void
317draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 258draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
318{ 259{
319
320 char buf[HUGE_BUF]; 260 char buf[HUGE_BUF];
321 261
322 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 262 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
323 return; 263 return;
324 264
325 if (pri >= pl->contr->listening) 265 if (pri >= pl->contr->listening)
326 return; 266 return;
267
327 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 268 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
328 { 269 {
329 va_list ap; 270 va_list ap;
330 271
331 LOG (llevDebug, "Non supported extension text type for client.\n"); 272 LOG (llevDebug, "Non supported extension text type for client.\n");
332 va_start (ap, new_format); 273 va_start (ap, new_format);
… …
341 282
342 va_start (ap, new_format); 283 va_start (ap, new_format);
343 vsnprintf (buf, HUGE_BUF, new_format, ap); 284 vsnprintf (buf, HUGE_BUF, new_format, ap);
344 va_end (ap); 285 va_end (ap);
345 strip_media_tag (buf); 286 strip_media_tag (buf);
346 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); 287 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
347 } 288 }
348} 289}
349 290
350/** 291/**
351 * Writes to everyone on the map *except* op. This is useful for emotions. 292 * Writes to everyone on the map *except* op. This is useful for emotions.
352 */ 293 */
353 294
354void 295void
355new_info_map_except (int color, maptile * map, object *op, const char *str) 296new_info_map_except (int color, maptile * map, object *op, const char *str)
356{ 297{
357 player *pl; 298 for_all_players (pl)
358
359 for (pl = first_player; pl != NULL; pl = pl->next)
360 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 299 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
361 {
362 new_draw_info (color, 0, pl->ob, str); 300 new_draw_info (color, 0, pl->ob, str);
363 }
364} 301}
365 302
366/** 303/**
367 * Writes to everyone on the map except op1 and op2 304 * Writes to everyone on the map except op1 and op2
368 */ 305 */
369 306
370void 307void
371new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 308new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
372{ 309{
373 player *pl; 310 for_all_players (pl)
374
375 for (pl = first_player; pl != NULL; pl = pl->next)
376 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 311 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
377 {
378 new_draw_info (color, 0, pl->ob, str); 312 new_draw_info (color, 0, pl->ob, str);
379 }
380} 313}
381 314
382/** 315/**
383 * Writes to everyone on the specified map 316 * Writes to everyone on the specified map
384 */ 317 */
385 318
386void 319void
387new_info_map (int color, maptile * map, const char *str) 320new_info_map (int color, maptile * map, const char *str)
388{ 321{
389 player *pl; 322 for_all_players (pl)
390
391 for (pl = first_player; pl != NULL; pl = pl->next)
392 if (pl->ob != NULL && pl->ob->map == map) 323 if (pl->ob != NULL && pl->ob->map == map)
393 {
394 new_draw_info (color, 0, pl->ob, str); 324 new_draw_info (color, 0, pl->ob, str);
395 }
396} 325}
397
398 326
399/** 327/**
400 * This does nothing now. However, in theory, we should probably send 328 * This does nothing now. However, in theory, we should probably send
401 * something to the client and let the client figure out how it might want 329 * something to the client and let the client figure out how it might want
402 * to handle this 330 * to handle this
… …
423 object *op; 351 object *op;
424 352
425 for (op = pl->inv; op; op = op->below) 353 for (op = pl->inv; op; op = op->below)
426 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) 354 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
427 break; 355 break;
356
428 if (op == NULL) 357 if (op == NULL)
429 break; 358 break;
430 359
431 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); 360 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
432 } 361 }
… …
490 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); 419 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
491 else 420 else
492 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 421 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
493} 422}
494 423
495
496/** 424/**
497 * Helper for magic map creation. 425 * Helper for magic map creation.
498 * 426 *
499 * Takes a player, the map_mark array and an x and y starting position. 427 * Takes a player, the map_mark array and an x and y starting position.
500 * pl is the player. 428 * pl is the player.
… …
508magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 436magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
509{ 437{
510 int x, y, dx, dy, mflags; 438 int x, y, dx, dy, mflags;
511 sint16 nx, ny; 439 sint16 nx, ny;
512 maptile *mp; 440 maptile *mp;
513 New_Face *f;
514 441
515 for (dx = -1; dx <= 1; dx++) 442 for (dx = -1; dx <= 1; dx++)
516 { 443 {
517 for (dy = -1; dy <= 1; dy++) 444 for (dy = -1; dy <= 1; dy++)
518 { 445 {
… …
530 if (mflags & P_OUT_OF_MAP) 457 if (mflags & P_OUT_OF_MAP)
531 continue; 458 continue;
532 459
533 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 460 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
534 { 461 {
535 f = GET_MAP_FACE (mp, nx, ny, 0); 462 int f = GET_MAP_FACE (mp, nx, ny, 0);
536 if (f == blank_face) 463 if (f == blank_face)
464 {
537 f = GET_MAP_FACE (mp, nx, ny, 1); 465 f = GET_MAP_FACE (mp, nx, ny, 1);
538 if (f == blank_face) 466 if (f == blank_face)
539 f = GET_MAP_FACE (mp, nx, ny, 2); 467 f = GET_MAP_FACE (mp, nx, ny, 2);
468 }
469
470 int magicmap = faces [f].magicmap;
540 471
541 /* Should probably have P_NO_MAGIC here also, but then shops don't 472 /* Should probably have P_NO_MAGIC here also, but then shops don't
542 * work. 473 * work.
543 */ 474 */
544 if (mflags & P_BLOCKSVIEW) 475 if (mflags & P_BLOCKSVIEW)
545 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 476 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
546 else 477 else
547 { 478 {
548 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 479 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
549 magic_mapping_mark_recursive (pl, map_mark, x, y); 480 magic_mapping_mark_recursive (pl, map_mark, x, y);
550 } 481 }
551 } 482 }
552 } 483 }
553 } 484 }
554} 485}
555
556 486
557/** 487/**
558 * Creates magic map for player. 488 * Creates magic map for player.
559 * 489 *
560 * Note: For improved magic mapping display, the space that blocks 490 * Note: For improved magic mapping display, the space that blocks
… …
562 * being nonzero have been changed to check for 1. Also, since 492 * being nonzero have been changed to check for 1. Also, since
563 * map_mark is a char value, putting 2 in should cause no problems. 493 * map_mark is a char value, putting 2 in should cause no problems.
564 * 494 *
565 * This function examines the map the player is on, and determines what 495 * This function examines the map the player is on, and determines what
566 * is visible. 2 is set for walls or objects that blocks view. 1 496 * is visible. 2 is set for walls or objects that blocks view. 1
567 * is for open spaces. map_mark should already have been initialized 497 * is for open spaces. map_mark should already have been initialised
568 * to zero before this is called. 498 * to zero before this is called.
569 * strength is an initial strength*2 rectangular area that we automatically 499 * strength is an initial strength*2 rectangular area that we automatically
570 * see in/penetrate through. 500 * see in/penetrate through.
571 */ 501 */
572
573void 502void
574magic_mapping_mark (object *pl, char *map_mark, int strength) 503magic_mapping_mark (object *pl, char *map_mark, int strength)
575{ 504{
576 int x, y, mflags; 505 int x, y, mflags;
577 sint16 nx, ny; 506 sint16 nx, ny;
578 maptile *mp; 507 maptile *mp;
579 New_Face *f;
580 508
581 for (x = -strength; x < strength; x++) 509 for (x = -strength; x < strength; x++)
582 { 510 {
583 for (y = -strength; y < strength; y++) 511 for (y = -strength; y < strength; y++)
584 { 512 {
585 mp = pl->map; 513 mp = pl->map;
586 nx = pl->x + x; 514 nx = pl->x + x;
587 ny = pl->y + y; 515 ny = pl->y + y;
516
588 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 517 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
589 if (mflags & P_OUT_OF_MAP) 518 if (mflags & P_OUT_OF_MAP)
590 continue; 519 continue;
591 else 520
521 int f = GET_MAP_FACE (mp, nx, ny, 0);
522 if (f == blank_face)
592 { 523 {
593 f = GET_MAP_FACE (mp, nx, ny, 0);
594 if (f == blank_face)
595 f = GET_MAP_FACE (mp, nx, ny, 1); 524 f = GET_MAP_FACE (mp, nx, ny, 1);
596 if (f == blank_face) 525 if (f == blank_face)
597 f = GET_MAP_FACE (mp, nx, ny, 2); 526 f = GET_MAP_FACE (mp, nx, ny, 2);
598 } 527 }
599 528
529 int magicmap = faces [f].magicmap;
530
600 if (mflags & P_BLOCKSVIEW) 531 if (mflags & P_BLOCKSVIEW)
601 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 532 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
602 else 533 else
603 { 534 {
604 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 535 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
605 magic_mapping_mark_recursive (pl, map_mark, x, y); 536 magic_mapping_mark_recursive (pl, map_mark, x, y);
606 } 537 }
607 } 538 }
608 } 539 }
609} 540}
610 541
611
612/** 542/**
613 * Creates and sends magic map to player. 543 * Creates and sends magic map to player.
614 * 544 *
615 * The following function is a lot messier than it really should be, 545 * The following function is a lot messier than it really should be,
616 * but there is no real easy solution. 546 * but there is no real easy solution.
617 * 547 *
618 * Mark Wedel 548 * Mark Wedel
619 */ 549 */
620
621void 550void
622draw_magic_map (object *pl) 551draw_magic_map (object *pl)
623{ 552{
624 int x, y;
625 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 553 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
626 int xmin, xmax, ymin, ymax; 554 int xmin, xmax, ymin, ymax;
627 SockList sl;
628 555
629 if (pl->type != PLAYER) 556 if (pl->type != PLAYER)
630 { 557 {
631 LOG (llevError, "Non player object called draw_map.\n"); 558 LOG (llevError, "Non player object called draw_map.\n");
632 return; 559 return;
… …
642 */ 569 */
643 xmin = MAGIC_MAP_SIZE; 570 xmin = MAGIC_MAP_SIZE;
644 ymin = MAGIC_MAP_SIZE; 571 ymin = MAGIC_MAP_SIZE;
645 xmax = 0; 572 xmax = 0;
646 ymax = 0; 573 ymax = 0;
574
647 for (x = 0; x < MAGIC_MAP_SIZE; x++) 575 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
648 {
649 for (y = 0; y < MAGIC_MAP_SIZE; y++) 576 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
650 {
651 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 577 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
652 { 578 {
653 xmin = x < xmin ? x : xmin; 579 xmin = x < xmin ? x : xmin;
654 xmax = x > xmax ? x : xmax; 580 xmax = x > xmax ? x : xmax;
655 ymin = y < ymin ? y : ymin; 581 ymin = y < ymin ? y : ymin;
656 ymax = y > ymax ? y : ymax; 582 ymax = y > ymax ? y : ymax;
657 } 583 }
658 }
659 }
660 584
661 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 585 packet sl;
662 snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 586 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
663 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 587 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
664 sl.len = strlen ((char *) sl.buf);
665 588
666 for (y = ymin; y <= ymax; y++) 589 for (int y = ymin; y <= ymax; y++)
667 {
668 for (x = xmin; x <= xmax; x++) 590 for (int x = xmin; x <= xmax; x++)
669 {
670 sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; 591 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
671 } /* x loop */
672 } /* y loop */
673 592
674 Send_With_Handling (&pl->contr->socket, &sl); 593 pl->contr->ns->send_packet (sl);
675 free (sl.buf); 594
676 free (map_mark); 595 free (map_mark);
677} 596}
678 597
679
680/** 598/**
681 * Send a kill log record to sockets 599 * Send a kill log record to sockets
682 */ 600 */
683
684void 601void
685Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) 602Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
686{ 603{
687 int i;
688 size_t len; 604 size_t len;
689 char buf[MAX_BUF]; 605 char buf[MAX_BUF];
690 606
691 if (With != NULL) 607 if (With != NULL)
692 {
693 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); 608 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
694 }
695 else 609 else
696 {
697 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); 610 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
698 } 611
699 len = strlen (buf); 612 len = strlen (buf);
700 for (i = 1; i < socket_info.allocated_sockets; i++)
701 {
702 if (init_sockets[i].old_mode == Old_Listen)
703 {
704 cs_write_string (&init_sockets[i], buf, len);
705 }
706 }
707} 613}
614

Diff Legend

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