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.21 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.25 by root, Mon Dec 25 14:43:23 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 (client * ns, int color, const char *str) 48esrv_print_msg (client *ns, int color, const char *str)
49{ 49{
50 ns->send_packet_printf ("drawinfo %d %s", color, str); 50 ns->send_packet_printf ("drawinfo %d %s", color, str);
51} 51}
52 52
53/** 53/**
… …
58 * subtype type and subtype of text message 58 * subtype type and subtype of text message
59 * 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
60 * message The main message 60 * message The main message
61 */ 61 */
62static void 62static void
63esrv_print_ext_msg (client * 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)
64{ 64{
65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
66} 66}
67 67
68/** 68/**
… …
73 * 73 *
74 * 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.
75 * 75 *
76 * Else sends message to player via esrv_print_msg 76 * Else sends message to player via esrv_print_msg
77 */ 77 */
78
79static void 78static void
80print_message (int colr, const object *pl, const char *tmp) 79print_message (int colr, const object *pl, const char *tmp)
81{ 80{
82
83 if (!tmp) 81 if (!tmp)
84 tmp = "[NULL]"; 82 tmp = "[NULL]";
85 83
86 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
87 return; 85 return;
88 86
89 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
90 esrv_print_msg (pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
91} 89}
92 90
93/** 91/**
94 * Prints out the contents of specified buffer structures, 92 * Prints out the contents of specified buffer structures,
95 * and clears the string. 93 * and clears the string.
96 */ 94 */
97
98void 95void
99flush_output_element (const object *pl, Output_Buf * outputs) 96flush_output_element (const object *pl, Output_Buf * outputs)
100{ 97{
101 char tbuf[MAX_BUF]; 98 char tbuf[MAX_BUF];
102 99
… …
126 * If found, checks if message should be sent now. 123 * If found, checks if message should be sent now.
127 * 124 *
128 * If message not already in buffers, flushes olders buffer, 125 * If message not already in buffers, flushes olders buffer,
129 * and adds message to queue. 126 * and adds message to queue.
130 */ 127 */
131
132static void 128static void
133check_output_buffers (const object *pl, const char *buf) 129check_output_buffers (const object *pl, const char *buf)
134{ 130{
135 int i, oldest = 0; 131 int i, oldest = 0;
136 132
… …
167 pl->contr->outputs[oldest].buf = buf; 163 pl->contr->outputs[oldest].buf = buf;
168 } 164 }
169 } 165 }
170} 166}
171 167
172
173
174/** 168/**
175 * Sends message to player(s). 169 * Sends message to player(s).
176 * 170 *
177 * flags is various flags - mostly color, plus a few specials. 171 * flags is various flags - mostly color, plus a few specials.
178 * 172 *
… …
189 */ 183 */
190 184
191void 185void
192new_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)
193{ 187{
194
195 if (flags & NDI_ALL) 188 if (flags & NDI_ALL)
196 { 189 {
197 player *tmppl; 190 player *tmppl;
198 191
199 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next) 192 for_all_players (pl)
200 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 193 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);
201 194
202 return; 195 return;
203 } 196 }
204 197
… …
228 * 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
229 * 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
230 * 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
231 * client/server bandwidth (client could keep track of various strings 224 * client/server bandwidth (client could keep track of various strings
232 */ 225 */
233
234void 226void
235new_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, ...)
236{ 228{
237 char buf[HUGE_BUF]; 229 char buf[HUGE_BUF];
238 230
… …
245 va_end (ap); 237 va_end (ap);
246 238
247 new_draw_info (flags, pri, pl, buf); 239 new_draw_info (flags, pri, pl, buf);
248} 240}
249 241
250
251void 242void
252draw_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)
253{ 244{
254 245
255 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 246 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
256 return; 247 return;
257 248
258 if (pri >= pl->contr->listening) 249 if (pri >= pl->contr->listening)
259 return; 250 return;
260 251
261 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) 252 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
262 { 253 {
263 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 254 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
264 255
265 if (buf == NULL) 256 if (buf == NULL)
266 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 257 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
271 new_draw_info (flags, pri, pl, buf); 262 new_draw_info (flags, pri, pl, buf);
272 free (buf); 263 free (buf);
273 } 264 }
274 } 265 }
275 else 266 else
276 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);
277} 268}
278 269
279void 270void
280draw_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, ...)
281{ 272{
… …
286 return; 277 return;
287 278
288 if (pri >= pl->contr->listening) 279 if (pri >= pl->contr->listening)
289 return; 280 return;
290 281
291 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) 282 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
292 { 283 {
293 va_list ap; 284 va_list ap;
294 285
295 LOG (llevDebug, "Non supported extension text type for client.\n"); 286 LOG (llevDebug, "Non supported extension text type for client.\n");
296 va_start (ap, new_format); 287 va_start (ap, new_format);
… …
305 296
306 va_start (ap, new_format); 297 va_start (ap, new_format);
307 vsnprintf (buf, HUGE_BUF, new_format, ap); 298 vsnprintf (buf, HUGE_BUF, new_format, ap);
308 va_end (ap); 299 va_end (ap);
309 strip_media_tag (buf); 300 strip_media_tag (buf);
310 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);
311 } 302 }
312} 303}
313 304
314/** 305/**
315 * 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.
… …
318void 309void
319new_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)
320{ 311{
321 player *pl; 312 player *pl;
322 313
323 for (pl = first_player; pl != NULL; pl = pl->next) 314 for_all_players (pl)
324 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 315 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
325 { 316 {
326 new_draw_info (color, 0, pl->ob, str); 317 new_draw_info (color, 0, pl->ob, str);
327 } 318 }
328} 319}
… …
334void 325void
335new_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)
336{ 327{
337 player *pl; 328 player *pl;
338 329
339 for (pl = first_player; pl != NULL; pl = pl->next) 330 for_all_players (pl)
340 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)
341 { 332 {
342 new_draw_info (color, 0, pl->ob, str); 333 new_draw_info (color, 0, pl->ob, str);
343 } 334 }
344} 335}
… …
350void 341void
351new_info_map (int color, maptile * map, const char *str) 342new_info_map (int color, maptile * map, const char *str)
352{ 343{
353 player *pl; 344 player *pl;
354 345
355 for (pl = first_player; pl != NULL; pl = pl->next) 346 for_all_players (pl)
356 if (pl->ob != NULL && pl->ob->map == map) 347 if (pl->ob != NULL && pl->ob->map == map)
357 { 348 {
358 new_draw_info (color, 0, pl->ob, str); 349 new_draw_info (color, 0, pl->ob, str);
359 } 350 }
360} 351}
… …
571 } 562 }
572 } 563 }
573 } 564 }
574} 565}
575 566
576
577/** 567/**
578 * Creates and sends magic map to player. 568 * Creates and sends magic map to player.
579 * 569 *
580 * 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,
581 * but there is no real easy solution. 571 * but there is no real easy solution.
… …
608 xmax = 0; 598 xmax = 0;
609 ymax = 0; 599 ymax = 0;
610 600
611 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 601 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
612 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 602 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
613 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 603 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
614 { 604 {
615 xmin = x < xmin ? x : xmin; 605 xmin = x < xmin ? x : xmin;
616 xmax = x > xmax ? x : xmax; 606 xmax = x > xmax ? x : xmax;
617 ymin = y < ymin ? y : ymin; 607 ymin = y < ymin ? y : ymin;
618 ymax = y > ymax ? y : ymax; 608 ymax = y > ymax ? y : ymax;
… …
624 614
625 for (int y = ymin; y <= ymax; y++) 615 for (int y = ymin; y <= ymax; y++)
626 for (int x = xmin; x <= xmax; x++) 616 for (int x = xmin; x <= xmax; x++)
627 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); 617 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
628 618
629 pl->contr->socket->send_packet (sl); 619 pl->contr->ns->send_packet (sl);
630 620
631 free (map_mark); 621 free (map_mark);
632} 622}
633 623
634
635/** 624/**
636 * Send a kill log record to sockets 625 * Send a kill log record to sockets
637 */ 626 */
638
639void 627void
640Log_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)
641{ 629{
642 size_t len; 630 size_t len;
643 char buf[MAX_BUF]; 631 char buf[MAX_BUF];
… …
647 else 635 else
648 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);
649 637
650 len = strlen (buf); 638 len = strlen (buf);
651} 639}
640

Diff Legend

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