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.9 by root, Tue Sep 19 10:12:41 2006 UTC vs.
Revision 1.26 by elmex, Tue Dec 26 10:42:47 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 *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 player *tmppl;
222 int i;
223 191
224 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next) 192 for_all_players (tmppl)
225 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 193 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);
226 194
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
237 return; 195 return;
238 } 196 }
197
239 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 198 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
240 { 199 {
241 /* Write to the socket? */ 200 /* Write to the socket? */
242 print_message (0, NULL, buf); 201 print_message (0, NULL, buf);
243 return; 202 return;
244 } 203 }
204
245 if (pl->type != PLAYER) 205 if (pl->type != PLAYER)
246 return; 206 return;
207
247 if (pri >= pl->contr->listening) 208 if (pri >= pl->contr->listening)
248 return; 209 return;
249 210
250 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 211 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
251 {
252 /* following prints stuff out, as appropriate */ 212 /* following prints stuff out, as appropriate */
253 check_output_buffers (pl, buf); 213 check_output_buffers (pl, buf);
254 }
255 else 214 else
256 {
257 print_message (flags & NDI_COLOR_MASK, pl, buf); 215 print_message (flags & NDI_COLOR_MASK, pl, buf);
258 }
259} 216}
260 217
261/** 218/**
262 * Wrapper for new_draw_info printf-like. 219 * Wrapper for new_draw_info printf-like.
263 * 220 *
264 * This is a pretty trivial function, but it allows us to use printf style 221 * 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 222 * 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 223 * it here. It may also have advantages in the future for reduction of
267 * client/server bandwidth (client could keep track of various strings 224 * client/server bandwidth (client could keep track of various strings
268 */ 225 */
269
270void 226void
271new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 227new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
272{ 228{
273 char buf[HUGE_BUF]; 229 char buf[HUGE_BUF];
274 230
… …
281 va_end (ap); 237 va_end (ap);
282 238
283 new_draw_info (flags, pri, pl, buf); 239 new_draw_info (flags, pri, pl, buf);
284} 240}
285 241
286
287void 242void
288draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) 243draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
289{ 244{
290 245
291 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 246 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
292 return; 247 return;
293 248
294 if (pri >= pl->contr->listening) 249 if (pri >= pl->contr->listening)
295 return; 250 return;
251
296 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 252 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
297 { 253 {
298 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 254 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
299 255
300 if (buf == NULL) 256 if (buf == NULL)
301 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 257 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
306 new_draw_info (flags, pri, pl, buf); 262 new_draw_info (flags, pri, pl, buf);
307 free (buf); 263 free (buf);
308 } 264 }
309 } 265 }
310 else 266 else
311 {
312 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message); 267 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
313 }
314} 268}
315 269
316void 270void
317draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 271draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
318{ 272{
… …
322 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 276 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
323 return; 277 return;
324 278
325 if (pri >= pl->contr->listening) 279 if (pri >= pl->contr->listening)
326 return; 280 return;
281
327 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 282 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
328 { 283 {
329 va_list ap; 284 va_list ap;
330 285
331 LOG (llevDebug, "Non supported extension text type for client.\n"); 286 LOG (llevDebug, "Non supported extension text type for client.\n");
332 va_start (ap, new_format); 287 va_start (ap, new_format);
… …
341 296
342 va_start (ap, new_format); 297 va_start (ap, new_format);
343 vsnprintf (buf, HUGE_BUF, new_format, ap); 298 vsnprintf (buf, HUGE_BUF, new_format, ap);
344 va_end (ap); 299 va_end (ap);
345 strip_media_tag (buf); 300 strip_media_tag (buf);
346 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); 301 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
347 } 302 }
348} 303}
349 304
350/** 305/**
351 * Writes to everyone on the map *except* op. This is useful for emotions. 306 * Writes to everyone on the map *except* op. This is useful for emotions.
… …
354void 309void
355new_info_map_except (int color, maptile * map, object *op, const char *str) 310new_info_map_except (int color, maptile * map, object *op, const char *str)
356{ 311{
357 player *pl; 312 player *pl;
358 313
359 for (pl = first_player; pl != NULL; pl = pl->next) 314 for_all_players (pl)
360 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 315 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
361 { 316 {
362 new_draw_info (color, 0, pl->ob, str); 317 new_draw_info (color, 0, pl->ob, str);
363 } 318 }
364} 319}
… …
370void 325void
371new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 326new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
372{ 327{
373 player *pl; 328 player *pl;
374 329
375 for (pl = first_player; pl != NULL; pl = pl->next) 330 for_all_players (pl)
376 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 331 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
377 { 332 {
378 new_draw_info (color, 0, pl->ob, str); 333 new_draw_info (color, 0, pl->ob, str);
379 } 334 }
380} 335}
… …
386void 341void
387new_info_map (int color, maptile * map, const char *str) 342new_info_map (int color, maptile * map, const char *str)
388{ 343{
389 player *pl; 344 player *pl;
390 345
391 for (pl = first_player; pl != NULL; pl = pl->next) 346 for_all_players (pl)
392 if (pl->ob != NULL && pl->ob->map == map) 347 if (pl->ob != NULL && pl->ob->map == map)
393 { 348 {
394 new_draw_info (color, 0, pl->ob, str); 349 new_draw_info (color, 0, pl->ob, str);
395 } 350 }
396} 351}
… …
423 object *op; 378 object *op;
424 379
425 for (op = pl->inv; op; op = op->below) 380 for (op = pl->inv; op; op = op->below)
426 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) 381 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
427 break; 382 break;
383
428 if (op == NULL) 384 if (op == NULL)
429 break; 385 break;
430 386
431 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); 387 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
432 } 388 }
… …
606 } 562 }
607 } 563 }
608 } 564 }
609} 565}
610 566
611
612/** 567/**
613 * Creates and sends magic map to player. 568 * Creates and sends magic map to player.
614 * 569 *
615 * The following function is a lot messier than it really should be, 570 * The following function is a lot messier than it really should be,
616 * but there is no real easy solution. 571 * but there is no real easy solution.
… …
619 */ 574 */
620 575
621void 576void
622draw_magic_map (object *pl) 577draw_magic_map (object *pl)
623{ 578{
624 int x, y;
625 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 579 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
626 int xmin, xmax, ymin, ymax; 580 int xmin, xmax, ymin, ymax;
627 SockList sl;
628 581
629 if (pl->type != PLAYER) 582 if (pl->type != PLAYER)
630 { 583 {
631 LOG (llevError, "Non player object called draw_map.\n"); 584 LOG (llevError, "Non player object called draw_map.\n");
632 return; 585 return;
… …
642 */ 595 */
643 xmin = MAGIC_MAP_SIZE; 596 xmin = MAGIC_MAP_SIZE;
644 ymin = MAGIC_MAP_SIZE; 597 ymin = MAGIC_MAP_SIZE;
645 xmax = 0; 598 xmax = 0;
646 ymax = 0; 599 ymax = 0;
600
647 for (x = 0; x < MAGIC_MAP_SIZE; x++) 601 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
648 {
649 for (y = 0; y < MAGIC_MAP_SIZE; y++) 602 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
650 {
651 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 603 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
652 { 604 {
653 xmin = x < xmin ? x : xmin; 605 xmin = x < xmin ? x : xmin;
654 xmax = x > xmax ? x : xmax; 606 xmax = x > xmax ? x : xmax;
655 ymin = y < ymin ? y : ymin; 607 ymin = y < ymin ? y : ymin;
656 ymax = y > ymax ? y : ymax; 608 ymax = y > ymax ? y : ymax;
657 } 609 }
658 }
659 }
660 610
661 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 611 packet sl;
662 snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 612 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
663 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 613 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
664 sl.len = strlen ((char *) sl.buf);
665 614
666 for (y = ymin; y <= ymax; y++) 615 for (int y = ymin; y <= ymax; y++)
667 {
668 for (x = xmin; x <= xmax; x++) 616 for (int x = xmin; x <= xmax; x++)
669 {
670 sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; 617 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
671 } /* x loop */
672 } /* y loop */
673 618
674 Send_With_Handling (&pl->contr->socket, &sl); 619 pl->contr->ns->send_packet (sl);
675 free (sl.buf); 620
676 free (map_mark); 621 free (map_mark);
677} 622}
678 623
679
680/** 624/**
681 * Send a kill log record to sockets 625 * Send a kill log record to sockets
682 */ 626 */
683
684void 627void
685Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) 628Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
686{ 629{
687 int i;
688 size_t len; 630 size_t len;
689 char buf[MAX_BUF]; 631 char buf[MAX_BUF];
690 632
691 if (With != NULL) 633 if (With != NULL)
692 {
693 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); 634 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
694 }
695 else 635 else
696 {
697 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); 636 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
698 } 637
699 len = strlen (buf); 638 len = strlen (buf);
700 for (i = 1; i < socket_info.allocated_sockets; i++)
701 {
702 if (init_sockets[i].old_mode == Old_Listen)
703 {
704 cs_write_string (&init_sockets[i], buf, len);
705 }
706 }
707} 639}
640

Diff Legend

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