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.12 by pippijn, Sat Dec 9 17:28:37 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
101 if (!tmp) 81 if (!tmp)
102 tmp = "[NULL]"; 82 tmp = "[NULL]";
103 83
104 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
105 return; 85 return;
106 86
107 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
108 {
109 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
110 return;
111 }
112} 89}
113 90
114/** 91/**
115 * Prints out the contents of specified buffer structures, 92 * Prints out the contents of specified buffer structures,
116 * and clears the string. 93 * and clears the string.
117 */ 94 */
118
119void 95void
120flush_output_element (const object *pl, Output_Buf * outputs) 96flush_output_element (const object *pl, Output_Buf * outputs)
121{ 97{
122 char tbuf[MAX_BUF]; 98 char tbuf[MAX_BUF];
123 99
… …
147 * If found, checks if message should be sent now. 123 * If found, checks if message should be sent now.
148 * 124 *
149 * If message not already in buffers, flushes olders buffer, 125 * If message not already in buffers, flushes olders buffer,
150 * and adds message to queue. 126 * and adds message to queue.
151 */ 127 */
152
153static void 128static void
154check_output_buffers (const object *pl, const char *buf) 129check_output_buffers (const object *pl, const char *buf)
155{ 130{
156 int i, oldest = 0; 131 int i, oldest = 0;
157 132
… …
188 pl->contr->outputs[oldest].buf = buf; 163 pl->contr->outputs[oldest].buf = buf;
189 } 164 }
190 } 165 }
191} 166}
192 167
193
194
195/** 168/**
196 * Sends message to player(s). 169 * Sends message to player(s).
197 * 170 *
198 * flags is various flags - mostly color, plus a few specials. 171 * flags is various flags - mostly color, plus a few specials.
199 * 172 *
… …
210 */ 183 */
211 184
212void 185void
213new_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)
214{ 187{
215
216 if (flags & NDI_ALL) 188 if (flags & NDI_ALL)
217 { 189 {
218 player *tmppl; 190 for_all_players (pl)
219
220 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
221 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 191 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
222 192
223 return; 193 return;
224 } 194 }
225 195
226 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 196 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
227 {
228 /* Write to the socket? */
229 print_message (0, NULL, buf);
230 return;
231 }
232
233 if (pl->type != PLAYER)
234 return; 197 return;
235 198
236 if (pri >= pl->contr->listening) 199 if (pri >= pl->contr->listening)
237 return; 200 return;
238 201
239 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 202 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
240 /* following prints stuff out, as appropriate */
241 check_output_buffers (pl, buf); 203 check_output_buffers (pl, buf);
242 else 204 else
243 print_message (flags & NDI_COLOR_MASK, pl, buf); 205 print_message (flags & NDI_COLOR_MASK, pl, buf);
244} 206}
245 207
… …
249 * 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
250 * 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
251 * 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
252 * client/server bandwidth (client could keep track of various strings 214 * client/server bandwidth (client could keep track of various strings
253 */ 215 */
254
255void 216void
256new_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, ...)
257{ 218{
258 char buf[HUGE_BUF]; 219 char buf[HUGE_BUF];
259 220
260 va_list ap; 221 va_list ap;
261
262 va_start (ap, format); 222 va_start (ap, format);
263
264 vsnprintf (buf, HUGE_BUF, format, ap); 223 vsnprintf (buf, HUGE_BUF, format, ap);
265
266 va_end (ap); 224 va_end (ap);
267 225
268 new_draw_info (flags, pri, pl, buf); 226 new_draw_info (flags, pri, pl, buf);
269} 227}
270 228
271
272void 229void
273draw_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)
274{ 231{
275 232
276 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 233 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
277 return; 234 return;
278 235
279 if (pri >= pl->contr->listening) 236 if (pri >= pl->contr->listening)
280 return; 237 return;
238
281 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 239 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
282 { 240 {
283 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 241 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
284 242
285 if (buf == NULL) 243 if (buf == NULL)
286 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 244 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
291 new_draw_info (flags, pri, pl, buf); 249 new_draw_info (flags, pri, pl, buf);
292 free (buf); 250 free (buf);
293 } 251 }
294 } 252 }
295 else 253 else
296 {
297 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);
298 }
299} 255}
300 256
301void 257void
302draw_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, ...)
303{ 259{
304
305 char buf[HUGE_BUF]; 260 char buf[HUGE_BUF];
306 261
307 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 262 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
308 return; 263 return;
309 264
310 if (pri >= pl->contr->listening) 265 if (pri >= pl->contr->listening)
311 return; 266 return;
267
312 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 268 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
313 { 269 {
314 va_list ap; 270 va_list ap;
315 271
316 LOG (llevDebug, "Non supported extension text type for client.\n"); 272 LOG (llevDebug, "Non supported extension text type for client.\n");
317 va_start (ap, new_format); 273 va_start (ap, new_format);
… …
326 282
327 va_start (ap, new_format); 283 va_start (ap, new_format);
328 vsnprintf (buf, HUGE_BUF, new_format, ap); 284 vsnprintf (buf, HUGE_BUF, new_format, ap);
329 va_end (ap); 285 va_end (ap);
330 strip_media_tag (buf); 286 strip_media_tag (buf);
331 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);
332 } 288 }
333} 289}
334 290
335/** 291/**
336 * 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.
337 */ 293 */
338 294
339void 295void
340new_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)
341{ 297{
342 player *pl; 298 for_all_players (pl)
343
344 for (pl = first_player; pl != NULL; pl = pl->next)
345 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 299 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
346 {
347 new_draw_info (color, 0, pl->ob, str); 300 new_draw_info (color, 0, pl->ob, str);
348 }
349} 301}
350 302
351/** 303/**
352 * Writes to everyone on the map except op1 and op2 304 * Writes to everyone on the map except op1 and op2
353 */ 305 */
354 306
355void 307void
356new_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)
357{ 309{
358 player *pl; 310 for_all_players (pl)
359
360 for (pl = first_player; pl != NULL; pl = pl->next)
361 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)
362 {
363 new_draw_info (color, 0, pl->ob, str); 312 new_draw_info (color, 0, pl->ob, str);
364 }
365} 313}
366 314
367/** 315/**
368 * Writes to everyone on the specified map 316 * Writes to everyone on the specified map
369 */ 317 */
370 318
371void 319void
372new_info_map (int color, maptile * map, const char *str) 320new_info_map (int color, maptile * map, const char *str)
373{ 321{
374 player *pl; 322 for_all_players (pl)
375
376 for (pl = first_player; pl != NULL; pl = pl->next)
377 if (pl->ob != NULL && pl->ob->map == map) 323 if (pl->ob != NULL && pl->ob->map == map)
378 {
379 new_draw_info (color, 0, pl->ob, str); 324 new_draw_info (color, 0, pl->ob, str);
380 }
381} 325}
382
383 326
384/** 327/**
385 * This does nothing now. However, in theory, we should probably send 328 * This does nothing now. However, in theory, we should probably send
386 * 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
387 * to handle this 330 * to handle this
… …
476 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);
477 else 420 else
478 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);
479} 422}
480 423
481
482/** 424/**
483 * Helper for magic map creation. 425 * Helper for magic map creation.
484 * 426 *
485 * 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.
486 * pl is the player. 428 * pl is the player.
… …
494magic_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)
495{ 437{
496 int x, y, dx, dy, mflags; 438 int x, y, dx, dy, mflags;
497 sint16 nx, ny; 439 sint16 nx, ny;
498 maptile *mp; 440 maptile *mp;
499 New_Face *f;
500 441
501 for (dx = -1; dx <= 1; dx++) 442 for (dx = -1; dx <= 1; dx++)
502 { 443 {
503 for (dy = -1; dy <= 1; dy++) 444 for (dy = -1; dy <= 1; dy++)
504 { 445 {
… …
516 if (mflags & P_OUT_OF_MAP) 457 if (mflags & P_OUT_OF_MAP)
517 continue; 458 continue;
518 459
519 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)
520 { 461 {
521 f = GET_MAP_FACE (mp, nx, ny, 0); 462 int f = GET_MAP_FACE (mp, nx, ny, 0);
522 if (f == blank_face) 463 if (f == blank_face)
464 {
523 f = GET_MAP_FACE (mp, nx, ny, 1); 465 f = GET_MAP_FACE (mp, nx, ny, 1);
524 if (f == blank_face) 466 if (f == blank_face)
525 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;
526 471
527 /* 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
528 * work. 473 * work.
529 */ 474 */
530 if (mflags & P_BLOCKSVIEW) 475 if (mflags & P_BLOCKSVIEW)
531 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;
532 else 477 else
533 { 478 {
534 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;
535 magic_mapping_mark_recursive (pl, map_mark, x, y); 480 magic_mapping_mark_recursive (pl, map_mark, x, y);
536 } 481 }
537 } 482 }
538 } 483 }
539 } 484 }
540} 485}
541
542 486
543/** 487/**
544 * Creates magic map for player. 488 * Creates magic map for player.
545 * 489 *
546 * Note: For improved magic mapping display, the space that blocks 490 * Note: For improved magic mapping display, the space that blocks
… …
548 * being nonzero have been changed to check for 1. Also, since 492 * being nonzero have been changed to check for 1. Also, since
549 * 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.
550 * 494 *
551 * 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
552 * 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
553 * is for open spaces. map_mark should already have been initialized 497 * is for open spaces. map_mark should already have been initialised
554 * to zero before this is called. 498 * to zero before this is called.
555 * strength is an initial strength*2 rectangular area that we automatically 499 * strength is an initial strength*2 rectangular area that we automatically
556 * see in/penetrate through. 500 * see in/penetrate through.
557 */ 501 */
558
559void 502void
560magic_mapping_mark (object *pl, char *map_mark, int strength) 503magic_mapping_mark (object *pl, char *map_mark, int strength)
561{ 504{
562 int x, y, mflags; 505 int x, y, mflags;
563 sint16 nx, ny; 506 sint16 nx, ny;
564 maptile *mp; 507 maptile *mp;
565 New_Face *f;
566 508
567 for (x = -strength; x < strength; x++) 509 for (x = -strength; x < strength; x++)
568 { 510 {
569 for (y = -strength; y < strength; y++) 511 for (y = -strength; y < strength; y++)
570 { 512 {
571 mp = pl->map; 513 mp = pl->map;
572 nx = pl->x + x; 514 nx = pl->x + x;
573 ny = pl->y + y; 515 ny = pl->y + y;
516
574 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 517 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
575 if (mflags & P_OUT_OF_MAP) 518 if (mflags & P_OUT_OF_MAP)
576 continue; 519 continue;
577 else 520
521 int f = GET_MAP_FACE (mp, nx, ny, 0);
522 if (f == blank_face)
578 { 523 {
579 f = GET_MAP_FACE (mp, nx, ny, 0);
580 if (f == blank_face)
581 f = GET_MAP_FACE (mp, nx, ny, 1); 524 f = GET_MAP_FACE (mp, nx, ny, 1);
582 if (f == blank_face) 525 if (f == blank_face)
583 f = GET_MAP_FACE (mp, nx, ny, 2); 526 f = GET_MAP_FACE (mp, nx, ny, 2);
584 } 527 }
585 528
529 int magicmap = faces [f].magicmap;
530
586 if (mflags & P_BLOCKSVIEW) 531 if (mflags & P_BLOCKSVIEW)
587 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;
588 else 533 else
589 { 534 {
590 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;
591 magic_mapping_mark_recursive (pl, map_mark, x, y); 536 magic_mapping_mark_recursive (pl, map_mark, x, y);
592 } 537 }
593 } 538 }
594 } 539 }
595} 540}
596 541
597
598/** 542/**
599 * Creates and sends magic map to player. 543 * Creates and sends magic map to player.
600 * 544 *
601 * 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,
602 * but there is no real easy solution. 546 * but there is no real easy solution.
603 * 547 *
604 * Mark Wedel 548 * Mark Wedel
605 */ 549 */
606
607void 550void
608draw_magic_map (object *pl) 551draw_magic_map (object *pl)
609{ 552{
610 int x, y;
611 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);
612 int xmin, xmax, ymin, ymax; 554 int xmin, xmax, ymin, ymax;
613 SockList sl;
614 555
615 if (pl->type != PLAYER) 556 if (pl->type != PLAYER)
616 { 557 {
617 LOG (llevError, "Non player object called draw_map.\n"); 558 LOG (llevError, "Non player object called draw_map.\n");
618 return; 559 return;
… …
628 */ 569 */
629 xmin = MAGIC_MAP_SIZE; 570 xmin = MAGIC_MAP_SIZE;
630 ymin = MAGIC_MAP_SIZE; 571 ymin = MAGIC_MAP_SIZE;
631 xmax = 0; 572 xmax = 0;
632 ymax = 0; 573 ymax = 0;
574
633 for (x = 0; x < MAGIC_MAP_SIZE; x++) 575 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
634 {
635 for (y = 0; y < MAGIC_MAP_SIZE; y++) 576 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
636 {
637 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 577 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
638 { 578 {
639 xmin = x < xmin ? x : xmin; 579 xmin = x < xmin ? x : xmin;
640 xmax = x > xmax ? x : xmax; 580 xmax = x > xmax ? x : xmax;
641 ymin = y < ymin ? y : ymin; 581 ymin = y < ymin ? y : ymin;
642 ymax = y > ymax ? y : ymax; 582 ymax = y > ymax ? y : ymax;
643 } 583 }
644 }
645 }
646 584
647 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 585 packet sl;
648 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),
649 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 587 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
650 sl.len = strlen ((char *) sl.buf);
651 588
652 for (y = ymin; y <= ymax; y++) 589 for (int y = ymin; y <= ymax; y++)
653 {
654 for (x = xmin; x <= xmax; x++) 590 for (int x = xmin; x <= xmax; x++)
655 {
656 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);
657 } /* x loop */
658 } /* y loop */
659 592
660 Send_With_Handling (&pl->contr->socket, &sl); 593 pl->contr->ns->send_packet (sl);
661 free (sl.buf); 594
662 free (map_mark); 595 free (map_mark);
663} 596}
664 597
665
666/** 598/**
667 * Send a kill log record to sockets 599 * Send a kill log record to sockets
668 */ 600 */
669
670void 601void
671Log_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)
672{ 603{
673 size_t len; 604 size_t len;
674 char buf[MAX_BUF]; 605 char buf[MAX_BUF];
… …
678 else 609 else
679 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);
680 611
681 len = strlen (buf); 612 len = strlen (buf);
682} 613}
614

Diff Legend

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