… | |
… | |
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 | */ |
47 | static void |
47 | static void |
48 | esrv_print_msg (NewSocket * ns, int color, const char *str) |
48 | esrv_print_msg (client *ns, int color, const char *str) |
49 | { |
49 | { |
50 | SockList sl (MAXSOCKBUF); |
|
|
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 | sl.free (); |
|
|
59 | } |
51 | } |
60 | |
52 | |
61 | /** |
53 | /** |
62 | * Draws an extended message on the client. |
54 | * Draws an extended message on the client. |
63 | * ns the socket to send message to |
55 | * ns the socket to send message to |
… | |
… | |
66 | * subtype type and subtype of text message |
58 | * subtype type and subtype of text message |
67 | * 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 |
68 | * message The main message |
60 | * message The main message |
69 | */ |
61 | */ |
70 | static void |
62 | static void |
71 | esrv_print_ext_msg (NewSocket * ns, int color, uint8 type, uint8 subtype, const char *message) |
63 | esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message) |
72 | { |
64 | { |
73 | SockList sl (MAXSOCKBUF); |
|
|
74 | |
|
|
75 | 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); |
76 | ns->send_packet (sl); |
|
|
77 | sl.free (); |
|
|
78 | } |
66 | } |
79 | |
67 | |
80 | /** |
68 | /** |
81 | * Frontend for esrv_print_msg |
69 | * Frontend for esrv_print_msg |
82 | * \param colr message color |
70 | * \param colr message color |
… | |
… | |
85 | * |
73 | * |
86 | * 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. |
87 | * |
75 | * |
88 | * Else sends message to player via esrv_print_msg |
76 | * Else sends message to player via esrv_print_msg |
89 | */ |
77 | */ |
90 | |
|
|
91 | static void |
78 | static void |
92 | print_message (int colr, const object *pl, const char *tmp) |
79 | print_message (int colr, const object *pl, const char *tmp) |
93 | { |
80 | { |
94 | |
|
|
95 | if (!tmp) |
81 | if (!tmp) |
96 | tmp = "[NULL]"; |
82 | tmp = "[NULL]"; |
97 | |
83 | |
98 | if (!pl || (pl->type == PLAYER && pl->contr == NULL)) |
84 | if (!pl || (pl->type == PLAYER && pl->contr == NULL)) |
99 | return; |
85 | return; |
100 | |
86 | |
101 | if (pl->type == PLAYER) |
87 | if (pl->type == PLAYER) |
102 | { |
|
|
103 | esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); |
88 | esrv_print_msg (pl->contr->ns, colr, (char *) tmp); |
104 | return; |
|
|
105 | } |
|
|
106 | } |
89 | } |
107 | |
90 | |
108 | /** |
91 | /** |
109 | * Prints out the contents of specified buffer structures, |
92 | * Prints out the contents of specified buffer structures, |
110 | * and clears the string. |
93 | * and clears the string. |
111 | */ |
94 | */ |
112 | |
|
|
113 | void |
95 | void |
114 | flush_output_element (const object *pl, Output_Buf * outputs) |
96 | flush_output_element (const object *pl, Output_Buf * outputs) |
115 | { |
97 | { |
116 | char tbuf[MAX_BUF]; |
98 | char tbuf[MAX_BUF]; |
117 | |
99 | |
… | |
… | |
141 | * If found, checks if message should be sent now. |
123 | * If found, checks if message should be sent now. |
142 | * |
124 | * |
143 | * If message not already in buffers, flushes olders buffer, |
125 | * If message not already in buffers, flushes olders buffer, |
144 | * and adds message to queue. |
126 | * and adds message to queue. |
145 | */ |
127 | */ |
146 | |
|
|
147 | static void |
128 | static void |
148 | check_output_buffers (const object *pl, const char *buf) |
129 | check_output_buffers (const object *pl, const char *buf) |
149 | { |
130 | { |
150 | int i, oldest = 0; |
131 | int i, oldest = 0; |
151 | |
132 | |
… | |
… | |
182 | pl->contr->outputs[oldest].buf = buf; |
163 | pl->contr->outputs[oldest].buf = buf; |
183 | } |
164 | } |
184 | } |
165 | } |
185 | } |
166 | } |
186 | |
167 | |
187 | |
|
|
188 | |
|
|
189 | /** |
168 | /** |
190 | * Sends message to player(s). |
169 | * Sends message to player(s). |
191 | * |
170 | * |
192 | * flags is various flags - mostly color, plus a few specials. |
171 | * flags is various flags - mostly color, plus a few specials. |
193 | * |
172 | * |
… | |
… | |
204 | */ |
183 | */ |
205 | |
184 | |
206 | void |
185 | void |
207 | new_draw_info (int flags, int pri, const object *pl, const char *buf) |
186 | new_draw_info (int flags, int pri, const object *pl, const char *buf) |
208 | { |
187 | { |
209 | |
|
|
210 | if (flags & NDI_ALL) |
188 | if (flags & NDI_ALL) |
211 | { |
189 | { |
212 | player *tmppl; |
190 | for_all_players (pl) |
213 | |
|
|
214 | for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next) |
|
|
215 | new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); |
191 | new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); |
216 | |
192 | |
217 | return; |
193 | return; |
218 | } |
194 | } |
219 | |
195 | |
220 | if (!pl || (pl->type == PLAYER && pl->contr == NULL)) |
196 | if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns) |
221 | { |
|
|
222 | /* Write to the socket? */ |
|
|
223 | print_message (0, NULL, buf); |
|
|
224 | return; |
|
|
225 | } |
|
|
226 | |
|
|
227 | if (pl->type != PLAYER) |
|
|
228 | return; |
197 | return; |
229 | |
198 | |
230 | if (pri >= pl->contr->listening) |
199 | if (pri >= pl->contr->listening) |
231 | return; |
200 | return; |
232 | |
201 | |
233 | if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) |
202 | if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) |
234 | /* following prints stuff out, as appropriate */ |
|
|
235 | check_output_buffers (pl, buf); |
203 | check_output_buffers (pl, buf); |
236 | else |
204 | else |
237 | print_message (flags & NDI_COLOR_MASK, pl, buf); |
205 | print_message (flags & NDI_COLOR_MASK, pl, buf); |
238 | } |
206 | } |
239 | |
207 | |
… | |
… | |
243 | * 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 |
244 | * 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 |
245 | * 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 |
246 | * client/server bandwidth (client could keep track of various strings |
214 | * client/server bandwidth (client could keep track of various strings |
247 | */ |
215 | */ |
248 | |
|
|
249 | void |
216 | void |
250 | new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) |
217 | new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) |
251 | { |
218 | { |
252 | char buf[HUGE_BUF]; |
219 | char buf[HUGE_BUF]; |
253 | |
220 | |
254 | va_list ap; |
221 | va_list ap; |
255 | |
|
|
256 | va_start (ap, format); |
222 | va_start (ap, format); |
257 | |
|
|
258 | vsnprintf (buf, HUGE_BUF, format, ap); |
223 | vsnprintf (buf, HUGE_BUF, format, ap); |
259 | |
|
|
260 | va_end (ap); |
224 | va_end (ap); |
261 | |
225 | |
262 | new_draw_info (flags, pri, pl, buf); |
226 | new_draw_info (flags, pri, pl, buf); |
263 | } |
227 | } |
264 | |
228 | |
265 | |
|
|
266 | void |
229 | void |
267 | draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) |
230 | draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) |
268 | { |
231 | { |
269 | |
232 | |
270 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
233 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
271 | return; |
234 | return; |
272 | |
235 | |
273 | if (pri >= pl->contr->listening) |
236 | if (pri >= pl->contr->listening) |
274 | return; |
237 | return; |
|
|
238 | |
275 | if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) |
239 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
276 | { |
240 | { |
277 | char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); |
241 | char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); |
278 | |
242 | |
279 | if (buf == NULL) |
243 | if (buf == NULL) |
280 | LOG (llevError, "info::draw_ext_info -> Out of memory!"); |
244 | LOG (llevError, "info::draw_ext_info -> Out of memory!"); |
… | |
… | |
285 | new_draw_info (flags, pri, pl, buf); |
249 | new_draw_info (flags, pri, pl, buf); |
286 | free (buf); |
250 | free (buf); |
287 | } |
251 | } |
288 | } |
252 | } |
289 | else |
253 | else |
290 | { |
|
|
291 | 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); |
292 | } |
|
|
293 | } |
255 | } |
294 | |
256 | |
295 | void |
257 | void |
296 | draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) |
258 | draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) |
297 | { |
259 | { |
… | |
… | |
301 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
263 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
302 | return; |
264 | return; |
303 | |
265 | |
304 | if (pri >= pl->contr->listening) |
266 | if (pri >= pl->contr->listening) |
305 | return; |
267 | return; |
|
|
268 | |
306 | if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) |
269 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
307 | { |
270 | { |
308 | va_list ap; |
271 | va_list ap; |
309 | |
272 | |
310 | LOG (llevDebug, "Non supported extension text type for client.\n"); |
273 | LOG (llevDebug, "Non supported extension text type for client.\n"); |
311 | va_start (ap, new_format); |
274 | va_start (ap, new_format); |
… | |
… | |
320 | |
283 | |
321 | va_start (ap, new_format); |
284 | va_start (ap, new_format); |
322 | vsnprintf (buf, HUGE_BUF, new_format, ap); |
285 | vsnprintf (buf, HUGE_BUF, new_format, ap); |
323 | va_end (ap); |
286 | va_end (ap); |
324 | strip_media_tag (buf); |
287 | strip_media_tag (buf); |
325 | 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); |
326 | } |
289 | } |
327 | } |
290 | } |
328 | |
291 | |
329 | /** |
292 | /** |
330 | * 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. |
… | |
… | |
333 | void |
296 | void |
334 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
297 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
335 | { |
298 | { |
336 | player *pl; |
299 | player *pl; |
337 | |
300 | |
338 | for (pl = first_player; pl != NULL; pl = pl->next) |
301 | for_all_players (pl) |
339 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
302 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
340 | { |
303 | { |
341 | new_draw_info (color, 0, pl->ob, str); |
304 | new_draw_info (color, 0, pl->ob, str); |
342 | } |
305 | } |
343 | } |
306 | } |
… | |
… | |
349 | void |
312 | void |
350 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
313 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
351 | { |
314 | { |
352 | player *pl; |
315 | player *pl; |
353 | |
316 | |
354 | for (pl = first_player; pl != NULL; pl = pl->next) |
317 | for_all_players (pl) |
355 | 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) |
356 | { |
319 | { |
357 | new_draw_info (color, 0, pl->ob, str); |
320 | new_draw_info (color, 0, pl->ob, str); |
358 | } |
321 | } |
359 | } |
322 | } |
… | |
… | |
365 | void |
328 | void |
366 | new_info_map (int color, maptile * map, const char *str) |
329 | new_info_map (int color, maptile * map, const char *str) |
367 | { |
330 | { |
368 | player *pl; |
331 | player *pl; |
369 | |
332 | |
370 | for (pl = first_player; pl != NULL; pl = pl->next) |
333 | for_all_players (pl) |
371 | if (pl->ob != NULL && pl->ob->map == map) |
334 | if (pl->ob != NULL && pl->ob->map == map) |
372 | { |
335 | { |
373 | new_draw_info (color, 0, pl->ob, str); |
336 | new_draw_info (color, 0, pl->ob, str); |
374 | } |
337 | } |
375 | } |
338 | } |
… | |
… | |
586 | } |
549 | } |
587 | } |
550 | } |
588 | } |
551 | } |
589 | } |
552 | } |
590 | |
553 | |
591 | |
|
|
592 | /** |
554 | /** |
593 | * Creates and sends magic map to player. |
555 | * Creates and sends magic map to player. |
594 | * |
556 | * |
595 | * 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, |
596 | * but there is no real easy solution. |
558 | * but there is no real easy solution. |
… | |
… | |
623 | xmax = 0; |
585 | xmax = 0; |
624 | ymax = 0; |
586 | ymax = 0; |
625 | |
587 | |
626 | for (int x = 0; x < MAGIC_MAP_SIZE; x++) |
588 | for (int x = 0; x < MAGIC_MAP_SIZE; x++) |
627 | for (int y = 0; y < MAGIC_MAP_SIZE; y++) |
589 | for (int y = 0; y < MAGIC_MAP_SIZE; y++) |
628 | if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) |
590 | if (map_mark[x + pl->map->width * y] | FACE_FLOOR) |
629 | { |
591 | { |
630 | xmin = x < xmin ? x : xmin; |
592 | xmin = x < xmin ? x : xmin; |
631 | xmax = x > xmax ? x : xmax; |
593 | xmax = x > xmax ? x : xmax; |
632 | ymin = y < ymin ? y : ymin; |
594 | ymin = y < ymin ? y : ymin; |
633 | ymax = y > ymax ? y : ymax; |
595 | ymax = y > ymax ? y : ymax; |
634 | } |
596 | } |
635 | |
597 | |
636 | SockList sl (MAXSOCKBUF); |
598 | packet sl; |
637 | sl.printf ("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), |
638 | MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); |
600 | MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); |
639 | |
601 | |
640 | for (int y = ymin; y <= ymax; y++) |
602 | for (int y = ymin; y <= ymax; y++) |
641 | for (int x = xmin; x <= xmax; x++) |
603 | for (int x = xmin; x <= xmax; x++) |
642 | sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); |
604 | sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); |
643 | |
605 | |
644 | Send_With_Handling (&pl->contr->socket, &sl); |
606 | pl->contr->ns->send_packet (sl); |
645 | |
|
|
646 | sl.free (); |
|
|
647 | |
607 | |
648 | free (map_mark); |
608 | free (map_mark); |
649 | } |
609 | } |
650 | |
610 | |
651 | |
|
|
652 | /** |
611 | /** |
653 | * Send a kill log record to sockets |
612 | * Send a kill log record to sockets |
654 | */ |
613 | */ |
655 | |
|
|
656 | void |
614 | void |
657 | Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) |
615 | Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) |
658 | { |
616 | { |
659 | size_t len; |
617 | size_t len; |
660 | char buf[MAX_BUF]; |
618 | char buf[MAX_BUF]; |
… | |
… | |
664 | else |
622 | else |
665 | 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); |
666 | |
624 | |
667 | len = strlen (buf); |
625 | len = strlen (buf); |
668 | } |
626 | } |
|
|
627 | |