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.11 by root, Wed Sep 20 21:53:50 2006 UTC vs.
Revision 1.18 by root, Thu Dec 14 05:09:32 2006 UTC

… …
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_socket * ns, int color, const char *str)
49{ 49{
50 char buf[HUGE_BUF]; 50 packet sl;
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); 51 sl.printf ("drawinfo %d %s", color, str);
59 } 52 ns->send_packet (sl);
60
61/* LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/
62 Write_String_To_Socket (ns, buf, strlen (buf));
63} 53}
64 54
65/** 55/**
66 * Draws an extended message on the client. 56 * Draws an extended message on the client.
67 * ns the socket to send message to 57 * ns the socket to send message to
… …
70 * subtype type and subtype of text message 60 * subtype type and subtype of text message
71 * intro Intro message to send with main message if client does not support the message type 61 * intro Intro message to send with main message if client does not support the message type
72 * message The main message 62 * message The main message
73 */ 63 */
74static void 64static void
75esrv_print_ext_msg (NewSocket * ns, int color, uint8 type, uint8 subtype, const char *message) 65esrv_print_ext_msg (client_socket * ns, int color, uint8 type, uint8 subtype, const char *message)
76{ 66{
77 char buf[HUGE_BUF]; 67 packet sl;
78 68
79 snprintf (buf, HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 69 sl.printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
80 Write_String_To_Socket (ns, buf, strlen (buf)); 70 ns->send_packet (sl);
81
82/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
83
84} 71}
85 72
86/** 73/**
87 * Frontend for esrv_print_msg 74 * Frontend for esrv_print_msg
88 * \param colr message color 75 * \param colr message color
… …
103 90
104 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 91 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
105 return; 92 return;
106 93
107 if (pl->type == PLAYER) 94 if (pl->type == PLAYER)
108 {
109 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 95 esrv_print_msg (pl->contr->socket, colr, (char *) tmp);
110 return;
111 }
112} 96}
113 97
114/** 98/**
115 * Prints out the contents of specified buffer structures, 99 * Prints out the contents of specified buffer structures,
116 * and clears the string. 100 * and clears the string.
… …
214{ 198{
215 199
216 if (flags & NDI_ALL) 200 if (flags & NDI_ALL)
217 { 201 {
218 player *tmppl; 202 player *tmppl;
219 int i;
220 203
221 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next) 204 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
222 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 205 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);
223 206
224 return; 207 return;
… …
277 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 260 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
278 return; 261 return;
279 262
280 if (pri >= pl->contr->listening) 263 if (pri >= pl->contr->listening)
281 return; 264 return;
265
282 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 266 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))
283 { 267 {
284 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 268 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
285 269
286 if (buf == NULL) 270 if (buf == NULL)
287 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 271 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
292 new_draw_info (flags, pri, pl, buf); 276 new_draw_info (flags, pri, pl, buf);
293 free (buf); 277 free (buf);
294 } 278 }
295 } 279 }
296 else 280 else
297 {
298 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message); 281 esrv_print_ext_msg (pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message);
299 }
300} 282}
301 283
302void 284void
303draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 285draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
304{ 286{
… …
308 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 290 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
309 return; 291 return;
310 292
311 if (pri >= pl->contr->listening) 293 if (pri >= pl->contr->listening)
312 return; 294 return;
295
313 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 296 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))
314 { 297 {
315 va_list ap; 298 va_list ap;
316 299
317 LOG (llevDebug, "Non supported extension text type for client.\n"); 300 LOG (llevDebug, "Non supported extension text type for client.\n");
318 va_start (ap, new_format); 301 va_start (ap, new_format);
… …
327 310
328 va_start (ap, new_format); 311 va_start (ap, new_format);
329 vsnprintf (buf, HUGE_BUF, new_format, ap); 312 vsnprintf (buf, HUGE_BUF, new_format, ap);
330 va_end (ap); 313 va_end (ap);
331 strip_media_tag (buf); 314 strip_media_tag (buf);
332 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); 315 esrv_print_ext_msg (pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf);
333 } 316 }
334} 317}
335 318
336/** 319/**
337 * Writes to everyone on the map *except* op. This is useful for emotions. 320 * Writes to everyone on the map *except* op. This is useful for emotions.
… …
606 */ 589 */
607 590
608void 591void
609draw_magic_map (object *pl) 592draw_magic_map (object *pl)
610{ 593{
611 int x, y;
612 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 594 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
613 int xmin, xmax, ymin, ymax; 595 int xmin, xmax, ymin, ymax;
614 SockList sl;
615 596
616 if (pl->type != PLAYER) 597 if (pl->type != PLAYER)
617 { 598 {
618 LOG (llevError, "Non player object called draw_map.\n"); 599 LOG (llevError, "Non player object called draw_map.\n");
619 return; 600 return;
… …
629 */ 610 */
630 xmin = MAGIC_MAP_SIZE; 611 xmin = MAGIC_MAP_SIZE;
631 ymin = MAGIC_MAP_SIZE; 612 ymin = MAGIC_MAP_SIZE;
632 xmax = 0; 613 xmax = 0;
633 ymax = 0; 614 ymax = 0;
615
634 for (x = 0; x < MAGIC_MAP_SIZE; x++) 616 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
635 {
636 for (y = 0; y < MAGIC_MAP_SIZE; y++) 617 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
637 {
638 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 618 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR)
639 { 619 {
640 xmin = x < xmin ? x : xmin; 620 xmin = x < xmin ? x : xmin;
641 xmax = x > xmax ? x : xmax; 621 xmax = x > xmax ? x : xmax;
642 ymin = y < ymin ? y : ymin; 622 ymin = y < ymin ? y : ymin;
643 ymax = y > ymax ? y : ymax; 623 ymax = y > ymax ? y : ymax;
644 } 624 }
645 }
646 }
647 625
648 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 626 packet sl;
649 snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 627 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
650 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 628 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
651 sl.len = strlen ((char *) sl.buf);
652 629
653 for (y = ymin; y <= ymax; y++) 630 for (int y = ymin; y <= ymax; y++)
654 {
655 for (x = xmin; x <= xmax; x++) 631 for (int x = xmin; x <= xmax; x++)
656 {
657 sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; 632 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
658 } /* x loop */
659 } /* y loop */
660 633
661 Send_With_Handling (&pl->contr->socket, &sl); 634 Send_With_Handling (pl->contr->socket, &sl);
662 free (sl.buf); 635
663 free (map_mark); 636 free (map_mark);
664} 637}
665 638
666 639
667/** 640/**
… …
669 */ 642 */
670 643
671void 644void
672Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) 645Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
673{ 646{
674 int i;
675 size_t len; 647 size_t len;
676 char buf[MAX_BUF]; 648 char buf[MAX_BUF];
677 649
678 if (With != NULL) 650 if (With != NULL)
679 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); 651 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);

Diff Legend

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