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.6 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.21 by root, Sat Dec 16 03:08:26 2006 UTC

1
1/* 2/*
2 CrossFire, A Multiplayer game for X-windows 3 CrossFire, A Multiplayer game for X-windows
3 4
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
… …
42 * 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
43 * parameter. the esrv_drawinfo functions should probably be 44 * parameter. the esrv_drawinfo functions should probably be
44 * replaced with this, just using black as the color. 45 * replaced with this, just using black as the color.
45 */ 46 */
46static void 47static void
47esrv_print_msg (NewSocket * ns, int color, const char *str) 48esrv_print_msg (client * ns, int color, const char *str)
48{ 49{
49 char buf[HUGE_BUF]; 50 ns->send_packet_printf ("drawinfo %d %s", color, str);
50
51 if (ns->status == Ns_Old)
52 {
53 snprintf (buf, HUGE_BUF, "%s\n", str);
54 }
55 else
56 {
57 snprintf (buf, HUGE_BUF, "drawinfo %d %s", color, str);
58 }
59
60/* LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/
61 Write_String_To_Socket (ns, buf, strlen (buf));
62} 51}
63 52
64/** 53/**
65 * Draws an extended message on the client. 54 * Draws an extended message on the client.
66 * ns the socket to send message to 55 * ns the socket to send message to
… …
69 * subtype type and subtype of text message 58 * subtype type and subtype of text message
70 * 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
71 * message The main message 60 * message The main message
72 */ 61 */
73static void 62static void
74esrv_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)
75{ 64{
76 char buf[HUGE_BUF];
77
78 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);
79 Write_String_To_Socket (ns, buf, strlen (buf));
80
81/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
82
83} 66}
84 67
85/** 68/**
86 * Frontend for esrv_print_msg 69 * Frontend for esrv_print_msg
87 * \param colr message color 70 * \param colr message color
… …
95 78
96static void 79static void
97print_message (int colr, const object *pl, const char *tmp) 80print_message (int colr, const object *pl, const char *tmp)
98{ 81{
99 82
100 if (tmp == (char *) NULL) 83 if (!tmp)
101 {
102 tmp = "[NULL]"; 84 tmp = "[NULL]";
103 }
104 85
105 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 86 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
106 return; 87 return;
107 88
108 if (pl->type == PLAYER) 89 if (pl->type == PLAYER)
109 {
110 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 90 esrv_print_msg (pl->contr->socket, colr, (char *) tmp);
111 return;
112 }
113} 91}
114
115 92
116/** 93/**
117 * Prints out the contents of specified buffer structures, 94 * Prints out the contents of specified buffer structures,
118 * and clears the string. 95 * and clears the string.
119 */ 96 */
… …
216{ 193{
217 194
218 if (flags & NDI_ALL) 195 if (flags & NDI_ALL)
219 { 196 {
220 player *tmppl; 197 player *tmppl;
221 int i;
222 198
223 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next) 199 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
224 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 200 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);
225 201
226 for (i = 1; i < socket_info.allocated_sockets; i++)
227 {
228 if (init_sockets[i].status == Ns_Old && init_sockets[i].old_mode != Old_Listen && pri < 10)
229 {
230 cs_write_string (&init_sockets[i], buf, strlen (buf));
231 /* Most messages don't have a newline, so add one */
232 cs_write_string (&init_sockets[i], "\n", 1);
233 }
234 }
235
236 return; 202 return;
237 } 203 }
204
238 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 205 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
239 { 206 {
240 /* Write to the socket? */ 207 /* Write to the socket? */
241 print_message (0, NULL, buf); 208 print_message (0, NULL, buf);
242 return; 209 return;
243 } 210 }
211
244 if (pl->type != PLAYER) 212 if (pl->type != PLAYER)
245 return; 213 return;
214
246 if (pri >= pl->contr->listening) 215 if (pri >= pl->contr->listening)
247 return; 216 return;
248 217
249 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 218 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
250 {
251 /* following prints stuff out, as appropriate */ 219 /* following prints stuff out, as appropriate */
252 check_output_buffers (pl, buf); 220 check_output_buffers (pl, buf);
253 }
254 else 221 else
255 {
256 print_message (flags & NDI_COLOR_MASK, pl, buf); 222 print_message (flags & NDI_COLOR_MASK, pl, buf);
257 }
258} 223}
259 224
260/** 225/**
261 * Wrapper for new_draw_info printf-like. 226 * Wrapper for new_draw_info printf-like.
262 * 227 *
… …
290 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 255 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
291 return; 256 return;
292 257
293 if (pri >= pl->contr->listening) 258 if (pri >= pl->contr->listening)
294 return; 259 return;
260
295 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 261 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))
296 { 262 {
297 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 263 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
298 264
299 if (buf == NULL) 265 if (buf == NULL)
300 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 266 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
305 new_draw_info (flags, pri, pl, buf); 271 new_draw_info (flags, pri, pl, buf);
306 free (buf); 272 free (buf);
307 } 273 }
308 } 274 }
309 else 275 else
310 {
311 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message); 276 esrv_print_ext_msg (pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message);
312 }
313} 277}
314 278
315void 279void
316draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 280draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
317{ 281{
… …
321 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 285 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
322 return; 286 return;
323 287
324 if (pri >= pl->contr->listening) 288 if (pri >= pl->contr->listening)
325 return; 289 return;
290
326 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 291 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))
327 { 292 {
328 va_list ap; 293 va_list ap;
329 294
330 LOG (llevDebug, "Non supported extension text type for client.\n"); 295 LOG (llevDebug, "Non supported extension text type for client.\n");
331 va_start (ap, new_format); 296 va_start (ap, new_format);
… …
340 305
341 va_start (ap, new_format); 306 va_start (ap, new_format);
342 vsnprintf (buf, HUGE_BUF, new_format, ap); 307 vsnprintf (buf, HUGE_BUF, new_format, ap);
343 va_end (ap); 308 va_end (ap);
344 strip_media_tag (buf); 309 strip_media_tag (buf);
345 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); 310 esrv_print_ext_msg (pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf);
346 } 311 }
347} 312}
348 313
349/** 314/**
350 * Writes to everyone on the map *except* op. This is useful for emotions. 315 * Writes to everyone on the map *except* op. This is useful for emotions.
351 */ 316 */
352 317
353void 318void
354new_info_map_except (int color, mapstruct *map, object *op, const char *str) 319new_info_map_except (int color, maptile * map, object *op, const char *str)
355{ 320{
356 player *pl; 321 player *pl;
357 322
358 for (pl = first_player; pl != NULL; pl = pl->next) 323 for (pl = first_player; pl != NULL; pl = pl->next)
359 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 324 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
… …
365/** 330/**
366 * Writes to everyone on the map except op1 and op2 331 * Writes to everyone on the map except op1 and op2
367 */ 332 */
368 333
369void 334void
370new_info_map_except2 (int color, mapstruct *map, object *op1, object *op2, const char *str) 335new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
371{ 336{
372 player *pl; 337 player *pl;
373 338
374 for (pl = first_player; pl != NULL; pl = pl->next) 339 for (pl = first_player; pl != NULL; pl = pl->next)
375 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 340 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
… …
381/** 346/**
382 * Writes to everyone on the specified map 347 * Writes to everyone on the specified map
383 */ 348 */
384 349
385void 350void
386new_info_map (int color, mapstruct *map, const char *str) 351new_info_map (int color, maptile * map, const char *str)
387{ 352{
388 player *pl; 353 player *pl;
389 354
390 for (pl = first_player; pl != NULL; pl = pl->next) 355 for (pl = first_player; pl != NULL; pl = pl->next)
391 if (pl->ob != NULL && pl->ob->map == map) 356 if (pl->ob != NULL && pl->ob->map == map)
… …
411void 376void
412rangetostring (object *pl, char *obuf) 377rangetostring (object *pl, char *obuf)
413{ 378{
414 switch (pl->contr->shoottype) 379 switch (pl->contr->shoottype)
415 { 380 {
416 case range_none: 381 case range_none:
417 strcpy (obuf, "Range: nothing"); 382 strcpy (obuf, "Range: nothing");
418 break; 383 break;
419 384
420 case range_bow: 385 case range_bow:
386 {
387 object *op;
388
389 for (op = pl->inv; op; op = op->below)
390 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
391 break;
392
393 if (op == NULL)
394 break;
395
396 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
397 }
398 break;
399
400 case range_magic:
401 if (settings.casting_time == TRUE)
421 { 402 {
422 object *op; 403 if (pl->casting_time > -1)
423 404 {
424 for (op = pl->inv; op; op = op->below) 405 if (pl->casting_time == 0)
425 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) 406 sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
426 break; 407 else
427 if (op == NULL) 408 sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
428 break; 409 }
429 410 else
430 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); 411 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
431 } 412 }
432 break;
433
434 case range_magic:
435 if (settings.casting_time == TRUE)
436 {
437 if (pl->casting_time > -1)
438 {
439 if (pl->casting_time == 0)
440 sprintf (obuf, "Range: Holding spell (%s)", (const char *) pl->spell->name);
441 else
442 sprintf (obuf, "Range: Casting spell (%s)", (const char *) pl->spell->name);
443 }
444 else
445 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
446 }
447 else 413 else
448 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); 414 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
449 break; 415 break;
450 416
451 case range_misc: 417 case range_misc:
452 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none"); 418 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
453 break; 419 break;
454 420
455 /* range_scroll is only used for controlling golems. If the 421 /* range_scroll is only used for controlling golems. If the
456 * the player does not have a golem, reset some things. 422 * the player does not have a golem, reset some things.
457 */ 423 */
458 case range_golem: 424 case range_golem:
459 if (pl->contr->ranges[range_golem] != NULL) 425 if (pl->contr->ranges[range_golem] != NULL)
460 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); 426 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
461 else 427 else
462 { 428 {
463 pl->contr->shoottype = range_none; 429 pl->contr->shoottype = range_none;
464 strcpy (obuf, "Range: nothing"); 430 strcpy (obuf, "Range: nothing");
465 } 431 }
466 break; 432 break;
467 433
468 case range_skill: 434 case range_skill:
469 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none"); 435 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
470 break; 436 break;
471 437
472 case range_builder: 438 case range_builder:
473 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0)); 439 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
474 break; 440 break;
475 441
476 default: 442 default:
477 strcpy (obuf, "Range: illegal"); 443 strcpy (obuf, "Range: illegal");
478 } 444 }
479} 445}
480 446
481/** 447/**
482 * Sets player title. 448 * Sets player title.
… …
506static void 472static void
507magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 473magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
508{ 474{
509 int x, y, dx, dy, mflags; 475 int x, y, dx, dy, mflags;
510 sint16 nx, ny; 476 sint16 nx, ny;
511 mapstruct *mp; 477 maptile *mp;
512 New_Face *f; 478 New_Face *f;
513 479
514 for (dx = -1; dx <= 1; dx++) 480 for (dx = -1; dx <= 1; dx++)
515 { 481 {
516 for (dy = -1; dy <= 1; dy++) 482 for (dy = -1; dy <= 1; dy++)
… …
572void 538void
573magic_mapping_mark (object *pl, char *map_mark, int strength) 539magic_mapping_mark (object *pl, char *map_mark, int strength)
574{ 540{
575 int x, y, mflags; 541 int x, y, mflags;
576 sint16 nx, ny; 542 sint16 nx, ny;
577 mapstruct *mp; 543 maptile *mp;
578 New_Face *f; 544 New_Face *f;
579 545
580 for (x = -strength; x < strength; x++) 546 for (x = -strength; x < strength; x++)
581 { 547 {
582 for (y = -strength; y < strength; y++) 548 for (y = -strength; y < strength; y++)
… …
618 */ 584 */
619 585
620void 586void
621draw_magic_map (object *pl) 587draw_magic_map (object *pl)
622{ 588{
623 int x, y;
624 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 589 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
625 int xmin, xmax, ymin, ymax; 590 int xmin, xmax, ymin, ymax;
626 SockList sl;
627 591
628 if (pl->type != PLAYER) 592 if (pl->type != PLAYER)
629 { 593 {
630 LOG (llevError, "Non player object called draw_map.\n"); 594 LOG (llevError, "Non player object called draw_map.\n");
631 return; 595 return;
… …
641 */ 605 */
642 xmin = MAGIC_MAP_SIZE; 606 xmin = MAGIC_MAP_SIZE;
643 ymin = MAGIC_MAP_SIZE; 607 ymin = MAGIC_MAP_SIZE;
644 xmax = 0; 608 xmax = 0;
645 ymax = 0; 609 ymax = 0;
610
646 for (x = 0; x < MAGIC_MAP_SIZE; x++) 611 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
647 {
648 for (y = 0; y < MAGIC_MAP_SIZE; y++) 612 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
649 {
650 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 613 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR)
651 { 614 {
652 xmin = x < xmin ? x : xmin; 615 xmin = x < xmin ? x : xmin;
653 xmax = x > xmax ? x : xmax; 616 xmax = x > xmax ? x : xmax;
654 ymin = y < ymin ? y : ymin; 617 ymin = y < ymin ? y : ymin;
655 ymax = y > ymax ? y : ymax; 618 ymax = y > ymax ? y : ymax;
656 } 619 }
657 }
658 }
659 620
660 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 621 packet sl;
661 snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 622 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
662 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 623 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
663 sl.len = strlen ((char *) sl.buf);
664 624
665 for (y = ymin; y <= ymax; y++) 625 for (int y = ymin; y <= ymax; y++)
666 {
667 for (x = xmin; x <= xmax; x++) 626 for (int x = xmin; x <= xmax; x++)
668 {
669 sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; 627 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
670 } /* x loop */
671 } /* y loop */
672 628
673 Send_With_Handling (&pl->contr->socket, &sl); 629 pl->contr->socket->send_packet (sl);
674 free (sl.buf); 630
675 free (map_mark); 631 free (map_mark);
676} 632}
677 633
678 634
679/** 635/**
… …
681 */ 637 */
682 638
683void 639void
684Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) 640Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
685{ 641{
686 int i;
687 size_t len; 642 size_t len;
688 char buf[MAX_BUF]; 643 char buf[MAX_BUF];
689 644
690 if (With != NULL) 645 if (With != NULL)
691 {
692 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); 646 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
693 }
694 else 647 else
695 {
696 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); 648 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
697 } 649
698 len = strlen (buf); 650 len = strlen (buf);
699 for (i = 1; i < socket_info.allocated_sockets; i++)
700 {
701 if (init_sockets[i].old_mode == Old_Listen)
702 {
703 cs_write_string (&init_sockets[i], buf, len);
704 }
705 }
706} 651}

Diff Legend

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