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.10 by root, Tue Sep 19 10:21:58 2006 UTC vs.
Revision 1.29 by pippijn, Wed Jan 3 00:21:36 2007 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 *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{
… …
322 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 263 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
323 return; 264 return;
324 265
325 if (pri >= pl->contr->listening) 266 if (pri >= pl->contr->listening)
326 return; 267 return;
268
327 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 269 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
328 { 270 {
329 va_list ap; 271 va_list ap;
330 272
331 LOG (llevDebug, "Non supported extension text type for client.\n"); 273 LOG (llevDebug, "Non supported extension text type for client.\n");
332 va_start (ap, new_format); 274 va_start (ap, new_format);
… …
341 283
342 va_start (ap, new_format); 284 va_start (ap, new_format);
343 vsnprintf (buf, HUGE_BUF, new_format, ap); 285 vsnprintf (buf, HUGE_BUF, new_format, ap);
344 va_end (ap); 286 va_end (ap);
345 strip_media_tag (buf); 287 strip_media_tag (buf);
346 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); 288 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
347 } 289 }
348} 290}
349 291
350/** 292/**
351 * Writes to everyone on the map *except* op. This is useful for emotions. 293 * Writes to everyone on the map *except* op. This is useful for emotions.
… …
354void 296void
355new_info_map_except (int color, maptile * map, object *op, const char *str) 297new_info_map_except (int color, maptile * map, object *op, const char *str)
356{ 298{
357 player *pl; 299 player *pl;
358 300
359 for (pl = first_player; pl != NULL; pl = pl->next) 301 for_all_players (pl)
360 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 302 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
361 { 303 {
362 new_draw_info (color, 0, pl->ob, str); 304 new_draw_info (color, 0, pl->ob, str);
363 } 305 }
364} 306}
… …
370void 312void
371new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 313new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
372{ 314{
373 player *pl; 315 player *pl;
374 316
375 for (pl = first_player; pl != NULL; pl = pl->next) 317 for_all_players (pl)
376 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 318 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
377 { 319 {
378 new_draw_info (color, 0, pl->ob, str); 320 new_draw_info (color, 0, pl->ob, str);
379 } 321 }
380} 322}
… …
386void 328void
387new_info_map (int color, maptile * map, const char *str) 329new_info_map (int color, maptile * map, const char *str)
388{ 330{
389 player *pl; 331 player *pl;
390 332
391 for (pl = first_player; pl != NULL; pl = pl->next) 333 for_all_players (pl)
392 if (pl->ob != NULL && pl->ob->map == map) 334 if (pl->ob != NULL && pl->ob->map == map)
393 { 335 {
394 new_draw_info (color, 0, pl->ob, str); 336 new_draw_info (color, 0, pl->ob, str);
395 } 337 }
396} 338}
… …
563 * being nonzero have been changed to check for 1. Also, since 505 * being nonzero have been changed to check for 1. Also, since
564 * map_mark is a char value, putting 2 in should cause no problems. 506 * map_mark is a char value, putting 2 in should cause no problems.
565 * 507 *
566 * This function examines the map the player is on, and determines what 508 * This function examines the map the player is on, and determines what
567 * is visible. 2 is set for walls or objects that blocks view. 1 509 * is visible. 2 is set for walls or objects that blocks view. 1
568 * is for open spaces. map_mark should already have been initialized 510 * is for open spaces. map_mark should already have been initialised
569 * to zero before this is called. 511 * to zero before this is called.
570 * strength is an initial strength*2 rectangular area that we automatically 512 * strength is an initial strength*2 rectangular area that we automatically
571 * see in/penetrate through. 513 * see in/penetrate through.
572 */ 514 */
573 515
… …
607 } 549 }
608 } 550 }
609 } 551 }
610} 552}
611 553
612
613/** 554/**
614 * Creates and sends magic map to player. 555 * Creates and sends magic map to player.
615 * 556 *
616 * The following function is a lot messier than it really should be, 557 * The following function is a lot messier than it really should be,
617 * but there is no real easy solution. 558 * but there is no real easy solution.
… …
620 */ 561 */
621 562
622void 563void
623draw_magic_map (object *pl) 564draw_magic_map (object *pl)
624{ 565{
625 int x, y;
626 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 566 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
627 int xmin, xmax, ymin, ymax; 567 int xmin, xmax, ymin, ymax;
628 SockList sl;
629 568
630 if (pl->type != PLAYER) 569 if (pl->type != PLAYER)
631 { 570 {
632 LOG (llevError, "Non player object called draw_map.\n"); 571 LOG (llevError, "Non player object called draw_map.\n");
633 return; 572 return;
… …
643 */ 582 */
644 xmin = MAGIC_MAP_SIZE; 583 xmin = MAGIC_MAP_SIZE;
645 ymin = MAGIC_MAP_SIZE; 584 ymin = MAGIC_MAP_SIZE;
646 xmax = 0; 585 xmax = 0;
647 ymax = 0; 586 ymax = 0;
587
648 for (x = 0; x < MAGIC_MAP_SIZE; x++) 588 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
649 {
650 for (y = 0; y < MAGIC_MAP_SIZE; y++) 589 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
651 {
652 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 590 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
653 { 591 {
654 xmin = x < xmin ? x : xmin; 592 xmin = x < xmin ? x : xmin;
655 xmax = x > xmax ? x : xmax; 593 xmax = x > xmax ? x : xmax;
656 ymin = y < ymin ? y : ymin; 594 ymin = y < ymin ? y : ymin;
657 ymax = y > ymax ? y : ymax; 595 ymax = y > ymax ? y : ymax;
658 } 596 }
659 }
660 }
661 597
662 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 598 packet sl;
663 snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 599 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
664 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 600 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
665 sl.len = strlen ((char *) sl.buf);
666 601
667 for (y = ymin; y <= ymax; y++) 602 for (int y = ymin; y <= ymax; y++)
668 {
669 for (x = xmin; x <= xmax; x++) 603 for (int x = xmin; x <= xmax; x++)
670 {
671 sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; 604 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
672 } /* x loop */
673 } /* y loop */
674 605
675 Send_With_Handling (&pl->contr->socket, &sl); 606 pl->contr->ns->send_packet (sl);
676 free (sl.buf); 607
677 free (map_mark); 608 free (map_mark);
678} 609}
679 610
680
681/** 611/**
682 * Send a kill log record to sockets 612 * Send a kill log record to sockets
683 */ 613 */
684
685void 614void
686Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) 615Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
687{ 616{
688 int i;
689 size_t len; 617 size_t len;
690 char buf[MAX_BUF]; 618 char buf[MAX_BUF];
691 619
692 if (With != NULL) 620 if (With != NULL)
693 {
694 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); 621 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
695 }
696 else 622 else
697 {
698 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); 623 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
699 } 624
700 len = strlen (buf); 625 len = strlen (buf);
701 for (i = 1; i < socket_info.allocated_sockets; i++)
702 {
703 if (init_sockets[i].old_mode == Old_Listen)
704 {
705 cs_write_string (&init_sockets[i], buf, len);
706 }
707 }
708} 626}
627

Diff Legend

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