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.15 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.33 by pippijn, Sat Jan 20 13:47:17 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
4 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Basic client output functions. 27 * Basic client output functions.
28 * 28 *
… …
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 packet sl;
51
52 if (ns->status == Ns_Old)
53 sl.printf ("%s\n", str);
54 else
55 sl.printf ("drawinfo %d %s", color, str); 50 ns->send_packet_printf ("drawinfo %d %s", color, str);
56
57 ns->send_packet (sl);
58} 51}
59 52
60/** 53/**
61 * Draws an extended message on the client. 54 * Draws an extended message on the client.
62 * ns the socket to send message to 55 * ns the socket to send message to
… …
65 * subtype type and subtype of text message 58 * subtype type and subtype of text message
66 * 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
67 * message The main message 60 * message The main message
68 */ 61 */
69static void 62static void
70esrv_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)
71{ 64{
72 packet sl;
73
74 sl.printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
75 ns->send_packet (sl);
76} 66}
77 67
78/** 68/**
79 * Frontend for esrv_print_msg 69 * Frontend for esrv_print_msg
80 * \param colr message color 70 * \param colr message color
… …
83 * 73 *
84 * 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.
85 * 75 *
86 * Else sends message to player via esrv_print_msg 76 * Else sends message to player via esrv_print_msg
87 */ 77 */
88
89static void 78static void
90print_message (int colr, const object *pl, const char *tmp) 79print_message (int colr, const object *pl, const char *tmp)
91{ 80{
92
93 if (!tmp) 81 if (!tmp)
94 tmp = "[NULL]"; 82 tmp = "[NULL]";
95 83
96 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
97 return; 85 return;
98 86
99 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
100 {
101 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
102 return;
103 }
104} 89}
105 90
106/** 91/**
107 * Prints out the contents of specified buffer structures, 92 * Prints out the contents of specified buffer structures,
108 * and clears the string. 93 * and clears the string.
109 */ 94 */
110
111void 95void
112flush_output_element (const object *pl, Output_Buf * outputs) 96flush_output_element (const object *pl, Output_Buf * outputs)
113{ 97{
114 char tbuf[MAX_BUF]; 98 char tbuf[MAX_BUF];
115 99
… …
139 * If found, checks if message should be sent now. 123 * If found, checks if message should be sent now.
140 * 124 *
141 * If message not already in buffers, flushes olders buffer, 125 * If message not already in buffers, flushes olders buffer,
142 * and adds message to queue. 126 * and adds message to queue.
143 */ 127 */
144
145static void 128static void
146check_output_buffers (const object *pl, const char *buf) 129check_output_buffers (const object *pl, const char *buf)
147{ 130{
148 int i, oldest = 0; 131 int i, oldest = 0;
149 132
… …
180 pl->contr->outputs[oldest].buf = buf; 163 pl->contr->outputs[oldest].buf = buf;
181 } 164 }
182 } 165 }
183} 166}
184 167
185
186
187/** 168/**
188 * Sends message to player(s). 169 * Sends message to player(s).
189 * 170 *
190 * flags is various flags - mostly color, plus a few specials. 171 * flags is various flags - mostly color, plus a few specials.
191 * 172 *
… …
202 */ 183 */
203 184
204void 185void
205new_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)
206{ 187{
207
208 if (flags & NDI_ALL) 188 if (flags & NDI_ALL)
209 { 189 {
210 player *tmppl; 190 for_all_players (pl)
211
212 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
213 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 191 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
214 192
215 return; 193 return;
216 } 194 }
217 195
218 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 196 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
219 {
220 /* Write to the socket? */
221 print_message (0, NULL, buf);
222 return;
223 }
224
225 if (pl->type != PLAYER)
226 return; 197 return;
227 198
228 if (pri >= pl->contr->listening) 199 if (pri >= pl->contr->listening)
229 return; 200 return;
230 201
231 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 202 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
232 /* following prints stuff out, as appropriate */
233 check_output_buffers (pl, buf); 203 check_output_buffers (pl, buf);
234 else 204 else
235 print_message (flags & NDI_COLOR_MASK, pl, buf); 205 print_message (flags & NDI_COLOR_MASK, pl, buf);
236} 206}
237 207
… …
241 * 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
242 * 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
243 * 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
244 * client/server bandwidth (client could keep track of various strings 214 * client/server bandwidth (client could keep track of various strings
245 */ 215 */
246
247void 216void
248new_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, ...)
249{ 218{
250 char buf[HUGE_BUF]; 219 char buf[HUGE_BUF];
251 220
252 va_list ap; 221 va_list ap;
253
254 va_start (ap, format); 222 va_start (ap, format);
255
256 vsnprintf (buf, HUGE_BUF, format, ap); 223 vsnprintf (buf, HUGE_BUF, format, ap);
257
258 va_end (ap); 224 va_end (ap);
259 225
260 new_draw_info (flags, pri, pl, buf); 226 new_draw_info (flags, pri, pl, buf);
261} 227}
262 228
263
264void 229void
265draw_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)
266{ 231{
267 232
268 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 233 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
269 return; 234 return;
270 235
271 if (pri >= pl->contr->listening) 236 if (pri >= pl->contr->listening)
272 return; 237 return;
238
273 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 239 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
274 { 240 {
275 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 241 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
276 242
277 if (buf == NULL) 243 if (buf == NULL)
278 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 244 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
283 new_draw_info (flags, pri, pl, buf); 249 new_draw_info (flags, pri, pl, buf);
284 free (buf); 250 free (buf);
285 } 251 }
286 } 252 }
287 else 253 else
288 {
289 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);
290 }
291} 255}
292 256
293void 257void
294draw_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, ...)
295{ 259{
296
297 char buf[HUGE_BUF]; 260 char buf[HUGE_BUF];
298 261
299 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 262 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
300 return; 263 return;
301 264
302 if (pri >= pl->contr->listening) 265 if (pri >= pl->contr->listening)
303 return; 266 return;
267
304 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 268 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
305 { 269 {
306 va_list ap; 270 va_list ap;
307 271
308 LOG (llevDebug, "Non supported extension text type for client.\n"); 272 LOG (llevDebug, "Non supported extension text type for client.\n");
309 va_start (ap, new_format); 273 va_start (ap, new_format);
… …
318 282
319 va_start (ap, new_format); 283 va_start (ap, new_format);
320 vsnprintf (buf, HUGE_BUF, new_format, ap); 284 vsnprintf (buf, HUGE_BUF, new_format, ap);
321 va_end (ap); 285 va_end (ap);
322 strip_media_tag (buf); 286 strip_media_tag (buf);
323 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); 287 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
324 } 288 }
325} 289}
326 290
327/** 291/**
328 * Writes to everyone on the map *except* op. This is useful for emotions. 292 * Writes to everyone on the map *except* op. This is useful for emotions.
… …
331void 295void
332new_info_map_except (int color, maptile * map, object *op, const char *str) 296new_info_map_except (int color, maptile * map, object *op, const char *str)
333{ 297{
334 player *pl; 298 player *pl;
335 299
336 for (pl = first_player; pl != NULL; pl = pl->next) 300 for_all_players (pl)
337 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 301 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
338 {
339 new_draw_info (color, 0, pl->ob, str); 302 new_draw_info (color, 0, pl->ob, str);
340 }
341} 303}
342 304
343/** 305/**
344 * Writes to everyone on the map except op1 and op2 306 * Writes to everyone on the map except op1 and op2
345 */ 307 */
… …
347void 309void
348new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 310new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
349{ 311{
350 player *pl; 312 player *pl;
351 313
352 for (pl = first_player; pl != NULL; pl = pl->next) 314 for_all_players (pl)
353 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 315 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
354 {
355 new_draw_info (color, 0, pl->ob, str); 316 new_draw_info (color, 0, pl->ob, str);
356 }
357} 317}
358 318
359/** 319/**
360 * Writes to everyone on the specified map 320 * Writes to everyone on the specified map
361 */ 321 */
… …
363void 323void
364new_info_map (int color, maptile * map, const char *str) 324new_info_map (int color, maptile * map, const char *str)
365{ 325{
366 player *pl; 326 player *pl;
367 327
368 for (pl = first_player; pl != NULL; pl = pl->next) 328 for_all_players (pl)
369 if (pl->ob != NULL && pl->ob->map == map) 329 if (pl->ob != NULL && pl->ob->map == map)
370 {
371 new_draw_info (color, 0, pl->ob, str); 330 new_draw_info (color, 0, pl->ob, str);
372 }
373} 331}
374
375 332
376/** 333/**
377 * This does nothing now. However, in theory, we should probably send 334 * This does nothing now. However, in theory, we should probably send
378 * something to the client and let the client figure out how it might want 335 * something to the client and let the client figure out how it might want
379 * to handle this 336 * to handle this
… …
486magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 443magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
487{ 444{
488 int x, y, dx, dy, mflags; 445 int x, y, dx, dy, mflags;
489 sint16 nx, ny; 446 sint16 nx, ny;
490 maptile *mp; 447 maptile *mp;
491 New_Face *f; 448 facetile *f;
492 449
493 for (dx = -1; dx <= 1; dx++) 450 for (dx = -1; dx <= 1; dx++)
494 { 451 {
495 for (dy = -1; dy <= 1; dy++) 452 for (dy = -1; dy <= 1; dy++)
496 { 453 {
… …
540 * being nonzero have been changed to check for 1. Also, since 497 * being nonzero have been changed to check for 1. Also, since
541 * map_mark is a char value, putting 2 in should cause no problems. 498 * map_mark is a char value, putting 2 in should cause no problems.
542 * 499 *
543 * This function examines the map the player is on, and determines what 500 * This function examines the map the player is on, and determines what
544 * is visible. 2 is set for walls or objects that blocks view. 1 501 * is visible. 2 is set for walls or objects that blocks view. 1
545 * is for open spaces. map_mark should already have been initialized 502 * is for open spaces. map_mark should already have been initialised
546 * to zero before this is called. 503 * to zero before this is called.
547 * strength is an initial strength*2 rectangular area that we automatically 504 * strength is an initial strength*2 rectangular area that we automatically
548 * see in/penetrate through. 505 * see in/penetrate through.
549 */ 506 */
550 507
… …
552magic_mapping_mark (object *pl, char *map_mark, int strength) 509magic_mapping_mark (object *pl, char *map_mark, int strength)
553{ 510{
554 int x, y, mflags; 511 int x, y, mflags;
555 sint16 nx, ny; 512 sint16 nx, ny;
556 maptile *mp; 513 maptile *mp;
557 New_Face *f; 514 facetile *f;
558 515
559 for (x = -strength; x < strength; x++) 516 for (x = -strength; x < strength; x++)
560 { 517 {
561 for (y = -strength; y < strength; y++) 518 for (y = -strength; y < strength; y++)
562 { 519 {
… …
584 } 541 }
585 } 542 }
586 } 543 }
587} 544}
588 545
589
590/** 546/**
591 * Creates and sends magic map to player. 547 * Creates and sends magic map to player.
592 * 548 *
593 * The following function is a lot messier than it really should be, 549 * The following function is a lot messier than it really should be,
594 * but there is no real easy solution. 550 * but there is no real easy solution.
595 * 551 *
596 * Mark Wedel 552 * Mark Wedel
597 */ 553 */
598
599void 554void
600draw_magic_map (object *pl) 555draw_magic_map (object *pl)
601{ 556{
602 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 557 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
603 int xmin, xmax, ymin, ymax; 558 int xmin, xmax, ymin, ymax;
… …
621 xmax = 0; 576 xmax = 0;
622 ymax = 0; 577 ymax = 0;
623 578
624 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 579 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
625 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 580 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
626 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 581 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
627 { 582 {
628 xmin = x < xmin ? x : xmin; 583 xmin = x < xmin ? x : xmin;
629 xmax = x > xmax ? x : xmax; 584 xmax = x > xmax ? x : xmax;
630 ymin = y < ymin ? y : ymin; 585 ymin = y < ymin ? y : ymin;
631 ymax = y > ymax ? y : ymax; 586 ymax = y > ymax ? y : ymax;
… …
637 592
638 for (int y = ymin; y <= ymax; y++) 593 for (int y = ymin; y <= ymax; y++)
639 for (int x = xmin; x <= xmax; x++) 594 for (int x = xmin; x <= xmax; x++)
640 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); 595 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
641 596
642 Send_With_Handling (&pl->contr->socket, &sl); 597 pl->contr->ns->send_packet (sl);
643
644 598
645 free (map_mark); 599 free (map_mark);
646} 600}
647 601
648
649/** 602/**
650 * Send a kill log record to sockets 603 * Send a kill log record to sockets
651 */ 604 */
652
653void 605void
654Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) 606Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
655{ 607{
656 size_t len; 608 size_t len;
657 char buf[MAX_BUF]; 609 char buf[MAX_BUF];
… …
661 else 613 else
662 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); 614 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
663 615
664 len = strlen (buf); 616 len = strlen (buf);
665} 617}
618

Diff Legend

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