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.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
101 if (!tmp) 81 if (!tmp)
102 tmp = "[NULL]"; 82 tmp = "[NULL]";
103 83
104 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
105 return; 85 return;
106 86
107 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
108 {
109 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
110 return;
111 }
112} 89}
113 90
114/** 91/**
115 * Prints out the contents of specified buffer structures, 92 * Prints out the contents of specified buffer structures,
116 * and clears the string. 93 * and clears the string.
117 */ 94 */
118
119void 95void
120flush_output_element (const object *pl, Output_Buf * outputs) 96flush_output_element (const object *pl, Output_Buf * outputs)
121{ 97{
122 char tbuf[MAX_BUF]; 98 char tbuf[MAX_BUF];
123 99
… …
147 * If found, checks if message should be sent now. 123 * If found, checks if message should be sent now.
148 * 124 *
149 * If message not already in buffers, flushes olders buffer, 125 * If message not already in buffers, flushes olders buffer,
150 * and adds message to queue. 126 * and adds message to queue.
151 */ 127 */
152
153static void 128static void
154check_output_buffers (const object *pl, const char *buf) 129check_output_buffers (const object *pl, const char *buf)
155{ 130{
156 int i, oldest = 0; 131 int i, oldest = 0;
157 132
… …
188 pl->contr->outputs[oldest].buf = buf; 163 pl->contr->outputs[oldest].buf = buf;
189 } 164 }
190 } 165 }
191} 166}
192 167
193
194
195/** 168/**
196 * Sends message to player(s). 169 * Sends message to player(s).
197 * 170 *
198 * flags is various flags - mostly color, plus a few specials. 171 * flags is various flags - mostly color, plus a few specials.
199 * 172 *
… …
210 */ 183 */
211 184
212void 185void
213new_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)
214{ 187{
215
216 if (flags & NDI_ALL) 188 if (flags & NDI_ALL)
217 { 189 {
218 player *tmppl; 190 for_all_players (pl)
219
220 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
221 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 191 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
222 192
223 return; 193 return;
224 } 194 }
225 195
226 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 196 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
227 {
228 /* Write to the socket? */
229 print_message (0, NULL, buf);
230 return;
231 }
232
233 if (pl->type != PLAYER)
234 return; 197 return;
235 198
236 if (pri >= pl->contr->listening) 199 if (pri >= pl->contr->listening)
237 return; 200 return;
238 201
239 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 202 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
240 /* following prints stuff out, as appropriate */
241 check_output_buffers (pl, buf); 203 check_output_buffers (pl, buf);
242 else 204 else
243 print_message (flags & NDI_COLOR_MASK, pl, buf); 205 print_message (flags & NDI_COLOR_MASK, pl, buf);
244} 206}
245 207
… …
249 * 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
250 * 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
251 * 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
252 * client/server bandwidth (client could keep track of various strings 214 * client/server bandwidth (client could keep track of various strings
253 */ 215 */
254
255void 216void
256new_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, ...)
257{ 218{
258 char buf[HUGE_BUF]; 219 char buf[HUGE_BUF];
259 220
260 va_list ap; 221 va_list ap;
261
262 va_start (ap, format); 222 va_start (ap, format);
263
264 vsnprintf (buf, HUGE_BUF, format, ap); 223 vsnprintf (buf, HUGE_BUF, format, ap);
265
266 va_end (ap); 224 va_end (ap);
267 225
268 new_draw_info (flags, pri, pl, buf); 226 new_draw_info (flags, pri, pl, buf);
269} 227}
270 228
271
272void 229void
273draw_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)
274{ 231{
275 232
276 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 233 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
277 return; 234 return;
278 235
279 if (pri >= pl->contr->listening) 236 if (pri >= pl->contr->listening)
280 return; 237 return;
238
281 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 239 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
282 { 240 {
283 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 241 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
284 242
285 if (buf == NULL) 243 if (buf == NULL)
286 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 244 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
291 new_draw_info (flags, pri, pl, buf); 249 new_draw_info (flags, pri, pl, buf);
292 free (buf); 250 free (buf);
293 } 251 }
294 } 252 }
295 else 253 else
296 {
297 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);
298 }
299} 255}
300 256
301void 257void
302draw_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, ...)
303{ 259{
… …
307 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 263 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
308 return; 264 return;
309 265
310 if (pri >= pl->contr->listening) 266 if (pri >= pl->contr->listening)
311 return; 267 return;
268
312 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 269 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
313 { 270 {
314 va_list ap; 271 va_list ap;
315 272
316 LOG (llevDebug, "Non supported extension text type for client.\n"); 273 LOG (llevDebug, "Non supported extension text type for client.\n");
317 va_start (ap, new_format); 274 va_start (ap, new_format);
… …
326 283
327 va_start (ap, new_format); 284 va_start (ap, new_format);
328 vsnprintf (buf, HUGE_BUF, new_format, ap); 285 vsnprintf (buf, HUGE_BUF, new_format, ap);
329 va_end (ap); 286 va_end (ap);
330 strip_media_tag (buf); 287 strip_media_tag (buf);
331 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);
332 } 289 }
333} 290}
334 291
335/** 292/**
336 * 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.
… …
339void 296void
340new_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)
341{ 298{
342 player *pl; 299 player *pl;
343 300
344 for (pl = first_player; pl != NULL; pl = pl->next) 301 for_all_players (pl)
345 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 302 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
346 { 303 {
347 new_draw_info (color, 0, pl->ob, str); 304 new_draw_info (color, 0, pl->ob, str);
348 } 305 }
349} 306}
… …
355void 312void
356new_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)
357{ 314{
358 player *pl; 315 player *pl;
359 316
360 for (pl = first_player; pl != NULL; pl = pl->next) 317 for_all_players (pl)
361 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)
362 { 319 {
363 new_draw_info (color, 0, pl->ob, str); 320 new_draw_info (color, 0, pl->ob, str);
364 } 321 }
365} 322}
… …
371void 328void
372new_info_map (int color, maptile * map, const char *str) 329new_info_map (int color, maptile * map, const char *str)
373{ 330{
374 player *pl; 331 player *pl;
375 332
376 for (pl = first_player; pl != NULL; pl = pl->next) 333 for_all_players (pl)
377 if (pl->ob != NULL && pl->ob->map == map) 334 if (pl->ob != NULL && pl->ob->map == map)
378 { 335 {
379 new_draw_info (color, 0, pl->ob, str); 336 new_draw_info (color, 0, pl->ob, str);
380 } 337 }
381} 338}
… …
548 * being nonzero have been changed to check for 1. Also, since 505 * being nonzero have been changed to check for 1. Also, since
549 * 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.
550 * 507 *
551 * 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
552 * 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
553 * is for open spaces. map_mark should already have been initialized 510 * is for open spaces. map_mark should already have been initialised
554 * to zero before this is called. 511 * to zero before this is called.
555 * strength is an initial strength*2 rectangular area that we automatically 512 * strength is an initial strength*2 rectangular area that we automatically
556 * see in/penetrate through. 513 * see in/penetrate through.
557 */ 514 */
558 515
… …
592 } 549 }
593 } 550 }
594 } 551 }
595} 552}
596 553
597
598/** 554/**
599 * Creates and sends magic map to player. 555 * Creates and sends magic map to player.
600 * 556 *
601 * 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,
602 * but there is no real easy solution. 558 * but there is no real easy solution.
… …
605 */ 561 */
606 562
607void 563void
608draw_magic_map (object *pl) 564draw_magic_map (object *pl)
609{ 565{
610 int x, y;
611 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);
612 int xmin, xmax, ymin, ymax; 567 int xmin, xmax, ymin, ymax;
613 SockList sl;
614 568
615 if (pl->type != PLAYER) 569 if (pl->type != PLAYER)
616 { 570 {
617 LOG (llevError, "Non player object called draw_map.\n"); 571 LOG (llevError, "Non player object called draw_map.\n");
618 return; 572 return;
… …
628 */ 582 */
629 xmin = MAGIC_MAP_SIZE; 583 xmin = MAGIC_MAP_SIZE;
630 ymin = MAGIC_MAP_SIZE; 584 ymin = MAGIC_MAP_SIZE;
631 xmax = 0; 585 xmax = 0;
632 ymax = 0; 586 ymax = 0;
587
633 for (x = 0; x < MAGIC_MAP_SIZE; x++) 588 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
634 {
635 for (y = 0; y < MAGIC_MAP_SIZE; y++) 589 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
636 {
637 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 590 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
638 { 591 {
639 xmin = x < xmin ? x : xmin; 592 xmin = x < xmin ? x : xmin;
640 xmax = x > xmax ? x : xmax; 593 xmax = x > xmax ? x : xmax;
641 ymin = y < ymin ? y : ymin; 594 ymin = y < ymin ? y : ymin;
642 ymax = y > ymax ? y : ymax; 595 ymax = y > ymax ? y : ymax;
643 } 596 }
644 }
645 }
646 597
647 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 598 packet sl;
648 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),
649 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 600 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
650 sl.len = strlen ((char *) sl.buf);
651 601
652 for (y = ymin; y <= ymax; y++) 602 for (int y = ymin; y <= ymax; y++)
653 {
654 for (x = xmin; x <= xmax; x++) 603 for (int x = xmin; x <= xmax; x++)
655 {
656 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);
657 } /* x loop */
658 } /* y loop */
659 605
660 Send_With_Handling (&pl->contr->socket, &sl); 606 pl->contr->ns->send_packet (sl);
661 free (sl.buf); 607
662 free (map_mark); 608 free (map_mark);
663} 609}
664 610
665
666/** 611/**
667 * Send a kill log record to sockets 612 * Send a kill log record to sockets
668 */ 613 */
669
670void 614void
671Log_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)
672{ 616{
673 size_t len; 617 size_t len;
674 char buf[MAX_BUF]; 618 char buf[MAX_BUF];
… …
678 else 622 else
679 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);
680 624
681 len = strlen (buf); 625 len = strlen (buf);
682} 626}
627

Diff Legend

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