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.16 by root, Thu Dec 14 02:37:37 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 51
52 if (ns->status == Ns_Old) 52 if (ns->status == Ns_Old)
53 { 53 sl.printf ("%s\n", str);
54 snprintf (buf, HUGE_BUF, "%s\n", str);
55 }
56 else 54 else
57 {
58 snprintf (buf, HUGE_BUF, "drawinfo %d %s", color, str); 55 sl.printf ("drawinfo %d %s", color, str);
59 }
60 56
61/* LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/ 57 ns->send_packet (sl);
62 Write_String_To_Socket (ns, buf, strlen (buf));
63} 58}
64 59
65/** 60/**
66 * Draws an extended message on the client. 61 * Draws an extended message on the client.
67 * ns the socket to send message to 62 * ns the socket to send message to
70 * subtype type and subtype of text message 65 * subtype type and subtype of text message
71 * intro Intro message to send with main message if client does not support the message type 66 * intro Intro message to send with main message if client does not support the message type
72 * message The main message 67 * message The main message
73 */ 68 */
74static void 69static void
75esrv_print_ext_msg (NewSocket * ns, int color, uint8 type, uint8 subtype, const char *message) 70esrv_print_ext_msg (client_socket * ns, int color, uint8 type, uint8 subtype, const char *message)
76{ 71{
77 char buf[HUGE_BUF]; 72 packet sl;
78 73
79 snprintf (buf, HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 74 sl.printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
80 Write_String_To_Socket (ns, buf, strlen (buf)); 75 ns->send_packet (sl);
81
82/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
83
84} 76}
85 77
86/** 78/**
87 * Frontend for esrv_print_msg 79 * Frontend for esrv_print_msg
88 * \param colr message color 80 * \param colr message color
605 */ 597 */
606 598
607void 599void
608draw_magic_map (object *pl) 600draw_magic_map (object *pl)
609{ 601{
610 int x, y;
611 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 602 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
612 int xmin, xmax, ymin, ymax; 603 int xmin, xmax, ymin, ymax;
613 SockList sl;
614 604
615 if (pl->type != PLAYER) 605 if (pl->type != PLAYER)
616 { 606 {
617 LOG (llevError, "Non player object called draw_map.\n"); 607 LOG (llevError, "Non player object called draw_map.\n");
618 return; 608 return;
628 */ 618 */
629 xmin = MAGIC_MAP_SIZE; 619 xmin = MAGIC_MAP_SIZE;
630 ymin = MAGIC_MAP_SIZE; 620 ymin = MAGIC_MAP_SIZE;
631 xmax = 0; 621 xmax = 0;
632 ymax = 0; 622 ymax = 0;
623
633 for (x = 0; x < MAGIC_MAP_SIZE; x++) 624 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
634 {
635 for (y = 0; y < MAGIC_MAP_SIZE; y++) 625 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
636 {
637 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 626 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR)
638 { 627 {
639 xmin = x < xmin ? x : xmin; 628 xmin = x < xmin ? x : xmin;
640 xmax = x > xmax ? x : xmax; 629 xmax = x > xmax ? x : xmax;
641 ymin = y < ymin ? y : ymin; 630 ymin = y < ymin ? y : ymin;
642 ymax = y > ymax ? y : ymax; 631 ymax = y > ymax ? y : ymax;
643 } 632 }
644 }
645 }
646 633
647 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 634 packet sl;
648 snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 635 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
649 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 636 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
650 sl.len = strlen ((char *) sl.buf);
651 637
652 for (y = ymin; y <= ymax; y++) 638 for (int y = ymin; y <= ymax; y++)
653 {
654 for (x = xmin; x <= xmax; x++) 639 for (int x = xmin; x <= xmax; x++)
655 {
656 sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; 640 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
657 } /* x loop */
658 } /* y loop */
659 641
660 Send_With_Handling (&pl->contr->socket, &sl); 642 Send_With_Handling (&pl->contr->socket, &sl);
661 free (sl.buf); 643
644
662 free (map_mark); 645 free (map_mark);
663} 646}
664 647
665 648
666/** 649/**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines