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

Diff Legend

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