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 | */ |
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 | 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 | */ |
74 | static void |
62 | static void |
75 | 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) |
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 | |
|
|
97 | static void |
78 | static void |
98 | print_message (int colr, const object *pl, const char *tmp) |
79 | print_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; |
89 | } |
|
|
90 | |
|
|
91 | bool |
|
|
92 | client::msg_suppressed (const char *msg) |
|
|
93 | { |
|
|
94 | if (!pl) |
|
|
95 | return false; |
|
|
96 | |
|
|
97 | if (pl->outputs_count <= 1 || !pl->outputs_sync) |
|
|
98 | return false; |
|
|
99 | |
|
|
100 | int len = strlen (msg); |
|
|
101 | |
|
|
102 | if (len > MSG_BUF_SIZE) |
|
|
103 | return false; |
|
|
104 | |
|
|
105 | msg_buf *lru = msgbuf; |
|
|
106 | for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf) |
111 | } |
107 | { |
112 | } |
108 | if (len == buf->len && !memcmp (msg, buf->msg, len)) |
113 | |
|
|
114 | /** |
|
|
115 | * Prints out the contents of specified buffer structures, |
|
|
116 | * and clears the string. |
|
|
117 | */ |
|
|
118 | |
|
|
119 | void |
|
|
120 | flush_output_element (const object *pl, Output_Buf * outputs) |
|
|
121 | { |
|
|
122 | char tbuf[MAX_BUF]; |
|
|
123 | |
|
|
124 | if (outputs->buf == NULL) |
|
|
125 | return; |
|
|
126 | if (outputs->count > 1) |
|
|
127 | { |
|
|
128 | snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf); |
|
|
129 | print_message (NDI_BLACK, pl, tbuf); |
|
|
130 | } |
|
|
131 | else |
|
|
132 | print_message (NDI_BLACK, pl, &outputs->buf); |
|
|
133 | |
|
|
134 | outputs->buf = NULL; |
|
|
135 | outputs->first_update = 0; /* This way, it will be reused */ |
|
|
136 | } |
|
|
137 | |
|
|
138 | /** |
|
|
139 | * Sends message to player through output buffers. |
|
|
140 | * \param pl player to send message |
|
|
141 | * \param buf message to send |
|
|
142 | * |
|
|
143 | * If player's output_count is 1, sends message directly. |
|
|
144 | * |
|
|
145 | * Else checks output buffers for specified message. |
|
|
146 | * |
|
|
147 | * If found, checks if message should be sent now. |
|
|
148 | * |
|
|
149 | * If message not already in buffers, flushes olders buffer, |
|
|
150 | * and adds message to queue. |
|
|
151 | */ |
|
|
152 | |
|
|
153 | static void |
|
|
154 | check_output_buffers (const object *pl, const char *buf) |
|
|
155 | { |
|
|
156 | int i, oldest = 0; |
|
|
157 | |
|
|
158 | if (pl->contr->outputs_count < 2) |
|
|
159 | { |
|
|
160 | print_message (NDI_BLACK, pl, buf); |
|
|
161 | return; |
|
|
162 | } |
|
|
163 | else |
|
|
164 | { |
|
|
165 | for (i = 0; i < NUM_OUTPUT_BUFS; i++) |
|
|
166 | { |
109 | { |
167 | if (pl->contr->outputs[i].buf && !strcmp (buf, pl->contr->outputs[i].buf)) |
110 | // found matching buf, see if expired |
|
|
111 | if (buf->expire <= pticks || !buf->count) |
168 | break; |
112 | { |
169 | else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) |
113 | // yes, take over matching buffer, print |
170 | oldest = i; |
114 | buf->expire = pticks + pl->outputs_sync; |
|
|
115 | buf->count = pl->outputs_count; |
|
|
116 | |
|
|
117 | return false; |
|
|
118 | } |
|
|
119 | |
|
|
120 | // no, suppress |
|
|
121 | --buf->count; |
|
|
122 | return true; |
171 | } |
123 | } |
172 | /* We found a match */ |
|
|
173 | if (i < NUM_OUTPUT_BUFS) |
|
|
174 | { |
|
|
175 | pl->contr->outputs[i].count++; |
|
|
176 | if (pl->contr->outputs[i].count >= pl->contr->outputs_count) |
|
|
177 | { |
|
|
178 | flush_output_element (pl, &pl->contr->outputs[i]); |
|
|
179 | } |
|
|
180 | } |
|
|
181 | /* No match - flush the oldest, and put the new one in */ |
|
|
182 | else |
|
|
183 | { |
|
|
184 | flush_output_element (pl, &pl->contr->outputs[oldest]); |
|
|
185 | |
124 | |
186 | pl->contr->outputs[oldest].first_update = pticks; |
125 | if (lru->expire > buf->expire) |
187 | pl->contr->outputs[oldest].count = 1; |
126 | lru = buf; |
188 | pl->contr->outputs[oldest].buf = buf; |
|
|
189 | } |
|
|
190 | } |
127 | } |
191 | } |
|
|
192 | |
128 | |
|
|
129 | // new message, evoke oldest buffer |
|
|
130 | lru->expire = pticks + pl->outputs_sync; |
|
|
131 | lru->count = pl->outputs_count; |
|
|
132 | lru->len = len; |
|
|
133 | memcpy (lru->msg, msg, len); |
193 | |
134 | |
|
|
135 | return false; |
|
|
136 | } |
194 | |
137 | |
195 | /** |
138 | /** |
196 | * Sends message to player(s). |
139 | * Sends message to player(s). |
197 | * |
140 | * |
198 | * flags is various flags - mostly color, plus a few specials. |
141 | * flags is various flags - mostly color, plus a few specials. |
… | |
… | |
206 | * in the flags. |
149 | * in the flags. |
207 | * |
150 | * |
208 | * If message is black, and not NDI_UNIQUE, gets sent through output buffers. |
151 | * If message is black, and not NDI_UNIQUE, gets sent through output buffers. |
209 | * |
152 | * |
210 | */ |
153 | */ |
211 | |
|
|
212 | void |
154 | void |
213 | new_draw_info (int flags, int pri, const object *pl, const char *buf) |
155 | new_draw_info (int flags, int pri, const object *pl, const char *buf) |
214 | { |
156 | { |
215 | |
|
|
216 | if (flags & NDI_ALL) |
157 | if (flags & NDI_ALL) |
217 | { |
158 | { |
218 | player *tmppl; |
159 | for_all_players (pl) |
219 | int i; |
|
|
220 | |
|
|
221 | for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next) |
|
|
222 | new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); |
160 | new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); |
223 | |
161 | |
224 | return; |
162 | return; |
225 | } |
163 | } |
226 | |
164 | |
227 | if (!pl || (pl->type == PLAYER && pl->contr == NULL)) |
165 | if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns) |
228 | { |
|
|
229 | /* Write to the socket? */ |
|
|
230 | print_message (0, NULL, buf); |
|
|
231 | return; |
|
|
232 | } |
|
|
233 | |
|
|
234 | if (pl->type != PLAYER) |
|
|
235 | return; |
166 | return; |
236 | |
167 | |
237 | if (pri >= pl->contr->listening) |
168 | if (pri >= pl->contr->listening) |
238 | return; |
169 | return; |
239 | |
170 | |
240 | if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) |
171 | if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK |
241 | /* following prints stuff out, as appropriate */ |
172 | || !pl->contr->ns->msg_suppressed (buf)) |
242 | check_output_buffers (pl, buf); |
|
|
243 | else |
|
|
244 | print_message (flags & NDI_COLOR_MASK, pl, buf); |
173 | print_message (flags & NDI_COLOR_MASK, pl, buf); |
245 | } |
174 | } |
246 | |
175 | |
247 | /** |
176 | /** |
248 | * Wrapper for new_draw_info printf-like. |
177 | * Wrapper for new_draw_info printf-like. |
… | |
… | |
250 | * This is a pretty trivial function, but it allows us to use printf style |
179 | * This is a pretty trivial function, but it allows us to use printf style |
251 | * formatting, so instead of the calling function having to do it, we do |
180 | * formatting, so instead of the calling function having to do it, we do |
252 | * it here. It may also have advantages in the future for reduction of |
181 | * it here. It may also have advantages in the future for reduction of |
253 | * client/server bandwidth (client could keep track of various strings |
182 | * client/server bandwidth (client could keep track of various strings |
254 | */ |
183 | */ |
255 | |
|
|
256 | void |
184 | void |
257 | new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) |
185 | new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) |
258 | { |
186 | { |
259 | char buf[HUGE_BUF]; |
187 | char buf[HUGE_BUF]; |
260 | |
188 | |
261 | va_list ap; |
189 | va_list ap; |
262 | |
|
|
263 | va_start (ap, format); |
190 | va_start (ap, format); |
264 | |
|
|
265 | vsnprintf (buf, HUGE_BUF, format, ap); |
191 | vsnprintf (buf, HUGE_BUF, format, ap); |
266 | |
|
|
267 | va_end (ap); |
192 | va_end (ap); |
268 | |
193 | |
269 | new_draw_info (flags, pri, pl, buf); |
194 | new_draw_info (flags, pri, pl, buf); |
270 | } |
195 | } |
271 | |
196 | |
272 | |
|
|
273 | void |
197 | void |
274 | draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) |
198 | draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) |
275 | { |
199 | { |
276 | |
200 | |
277 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
201 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
278 | return; |
202 | return; |
279 | |
203 | |
280 | if (pri >= pl->contr->listening) |
204 | if (pri >= pl->contr->listening) |
281 | return; |
205 | return; |
|
|
206 | |
282 | if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) |
207 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
283 | { |
208 | { |
284 | char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); |
209 | char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); |
285 | |
210 | |
286 | if (buf == NULL) |
211 | if (buf == NULL) |
287 | LOG (llevError, "info::draw_ext_info -> Out of memory!"); |
212 | LOG (llevError, "info::draw_ext_info -> Out of memory!"); |
… | |
… | |
292 | new_draw_info (flags, pri, pl, buf); |
217 | new_draw_info (flags, pri, pl, buf); |
293 | free (buf); |
218 | free (buf); |
294 | } |
219 | } |
295 | } |
220 | } |
296 | else |
221 | else |
297 | { |
|
|
298 | esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message); |
222 | esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message); |
299 | } |
|
|
300 | } |
223 | } |
301 | |
224 | |
302 | void |
225 | void |
303 | draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) |
226 | draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) |
304 | { |
227 | { |
305 | |
|
|
306 | char buf[HUGE_BUF]; |
228 | char buf[HUGE_BUF]; |
307 | |
229 | |
308 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
230 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
309 | return; |
231 | return; |
310 | |
232 | |
311 | if (pri >= pl->contr->listening) |
233 | if (pri >= pl->contr->listening) |
312 | return; |
234 | return; |
|
|
235 | |
313 | if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) |
236 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
314 | { |
237 | { |
315 | va_list ap; |
238 | va_list ap; |
316 | |
239 | |
317 | LOG (llevDebug, "Non supported extension text type for client.\n"); |
240 | LOG (llevDebug, "Non supported extension text type for client.\n"); |
318 | va_start (ap, new_format); |
241 | va_start (ap, new_format); |
… | |
… | |
327 | |
250 | |
328 | va_start (ap, new_format); |
251 | va_start (ap, new_format); |
329 | vsnprintf (buf, HUGE_BUF, new_format, ap); |
252 | vsnprintf (buf, HUGE_BUF, new_format, ap); |
330 | va_end (ap); |
253 | va_end (ap); |
331 | strip_media_tag (buf); |
254 | strip_media_tag (buf); |
332 | esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); |
255 | esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf); |
333 | } |
256 | } |
334 | } |
257 | } |
335 | |
258 | |
336 | /** |
259 | /** |
337 | * Writes to everyone on the map *except* op. This is useful for emotions. |
260 | * Writes to everyone on the map *except* op. This is useful for emotions. |
338 | */ |
261 | */ |
339 | |
262 | |
340 | void |
263 | void |
341 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
264 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
342 | { |
265 | { |
343 | player *pl; |
266 | for_all_players (pl) |
344 | |
|
|
345 | for (pl = first_player; pl != NULL; pl = pl->next) |
|
|
346 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
267 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
347 | { |
|
|
348 | new_draw_info (color, 0, pl->ob, str); |
268 | new_draw_info (color, 0, pl->ob, str); |
349 | } |
|
|
350 | } |
269 | } |
351 | |
270 | |
352 | /** |
271 | /** |
353 | * Writes to everyone on the map except op1 and op2 |
272 | * Writes to everyone on the map except op1 and op2 |
354 | */ |
273 | */ |
355 | |
274 | |
356 | void |
275 | void |
357 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
276 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
358 | { |
277 | { |
359 | player *pl; |
278 | for_all_players (pl) |
360 | |
|
|
361 | for (pl = first_player; pl != NULL; pl = pl->next) |
|
|
362 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) |
279 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) |
363 | { |
|
|
364 | new_draw_info (color, 0, pl->ob, str); |
280 | new_draw_info (color, 0, pl->ob, str); |
365 | } |
|
|
366 | } |
281 | } |
367 | |
282 | |
368 | /** |
283 | /** |
369 | * Writes to everyone on the specified map |
284 | * Writes to everyone on the specified map |
370 | */ |
285 | */ |
371 | |
286 | |
372 | void |
287 | void |
373 | new_info_map (int color, maptile * map, const char *str) |
288 | new_info_map (int color, maptile * map, const char *str) |
374 | { |
289 | { |
375 | player *pl; |
290 | for_all_players (pl) |
376 | |
|
|
377 | for (pl = first_player; pl != NULL; pl = pl->next) |
|
|
378 | if (pl->ob != NULL && pl->ob->map == map) |
291 | if (pl->ob != NULL && pl->ob->map == map) |
379 | { |
|
|
380 | new_draw_info (color, 0, pl->ob, str); |
292 | new_draw_info (color, 0, pl->ob, str); |
381 | } |
|
|
382 | } |
293 | } |
383 | |
|
|
384 | |
294 | |
385 | /** |
295 | /** |
386 | * This does nothing now. However, in theory, we should probably send |
296 | * This does nothing now. However, in theory, we should probably send |
387 | * something to the client and let the client figure out how it might want |
297 | * something to the client and let the client figure out how it might want |
388 | * to handle this |
298 | * to handle this |
… | |
… | |
398 | void |
308 | void |
399 | rangetostring (object *pl, char *obuf) |
309 | rangetostring (object *pl, char *obuf) |
400 | { |
310 | { |
401 | switch (pl->contr->shoottype) |
311 | switch (pl->contr->shoottype) |
402 | { |
312 | { |
403 | case range_none: |
|
|
404 | strcpy (obuf, "Range: nothing"); |
|
|
405 | break; |
|
|
406 | |
|
|
407 | case range_bow: |
313 | case range_bow: |
408 | { |
|
|
409 | object *op; |
|
|
410 | |
|
|
411 | for (op = pl->inv; op; op = op->below) |
314 | for (object *op = pl->inv; op; op = op->below) |
412 | if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) |
315 | if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) |
413 | break; |
|
|
414 | |
|
|
415 | if (op == NULL) |
|
|
416 | break; |
316 | { |
417 | |
|
|
418 | sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); |
317 | sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? &op->race : "nothing"); |
|
|
318 | return; |
419 | } |
319 | } |
|
|
320 | |
420 | break; |
321 | break; |
421 | |
322 | |
422 | case range_magic: |
323 | case range_magic: |
423 | if (settings.casting_time == TRUE) |
324 | if (settings.casting_time == TRUE) |
424 | { |
325 | { |
425 | if (pl->casting_time > -1) |
326 | if (pl->casting_time > -1) |
426 | { |
327 | { |
427 | if (pl->casting_time == 0) |
328 | if (pl->casting_time == 0) |
428 | sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name); |
329 | sprintf (obuf, "Holding spell: %s", &pl->spell->name); |
429 | else |
330 | else |
430 | sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name); |
331 | sprintf (obuf, "Casting spell: %s", &pl->spell->name); |
431 | } |
332 | } |
432 | else |
333 | else |
433 | sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); |
334 | sprintf (obuf, "Spell: %s", &pl->contr->ranges[range_magic]->name); |
434 | } |
335 | } |
435 | else |
336 | else |
436 | sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); |
337 | sprintf (obuf, "Spell: %s", &pl->contr->ranges[range_magic]->name); |
|
|
338 | |
437 | break; |
339 | return; |
438 | |
340 | |
439 | case range_misc: |
341 | case range_misc: |
440 | sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none"); |
342 | if (object *op = pl->contr->ranges[range_misc]) |
|
|
343 | { |
|
|
344 | sprintf (obuf, "Item: %s", query_base_name (op, 0)); |
|
|
345 | return; |
|
|
346 | } |
|
|
347 | |
441 | break; |
348 | break; |
442 | |
349 | |
443 | /* range_scroll is only used for controlling golems. If the |
350 | /* range_scroll is only used for controlling golems. If the |
444 | * the player does not have a golem, reset some things. |
351 | * the player does not have a golem, reset some things. |
445 | */ |
352 | */ |
446 | case range_golem: |
353 | case range_golem: |
447 | if (pl->contr->ranges[range_golem] != NULL) |
354 | if (object *golem = pl->contr->ranges[range_golem]) |
448 | sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); |
|
|
449 | else |
|
|
450 | { |
355 | { |
451 | pl->contr->shoottype = range_none; |
356 | sprintf (obuf, "Golem: %s", &golem->name); |
452 | strcpy (obuf, "Range: nothing"); |
357 | return; |
453 | } |
358 | } |
|
|
359 | |
454 | break; |
360 | break; |
455 | |
361 | |
456 | case range_skill: |
362 | case range_skill: |
457 | sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none"); |
363 | if (object *op = pl->chosen_skill) |
|
|
364 | { |
|
|
365 | sprintf (obuf, "Skill: %s", &op->name); |
|
|
366 | return; |
|
|
367 | } |
|
|
368 | |
458 | break; |
369 | break; |
459 | |
370 | |
460 | case range_builder: |
371 | case range_builder: |
461 | sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0)); |
372 | sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0)); |
462 | break; |
373 | return; |
|
|
374 | } |
463 | |
375 | |
464 | default: |
376 | pl->contr->shoottype = range_none; |
465 | strcpy (obuf, "Range: illegal"); |
377 | strcpy (obuf, "Range: nothing"); |
466 | } |
|
|
467 | } |
378 | } |
468 | |
379 | |
469 | /** |
380 | /** |
470 | * Sets player title. |
381 | * Sets player title. |
471 | */ |
382 | */ |
… | |
… | |
477 | sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); |
388 | sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); |
478 | else |
389 | else |
479 | sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); |
390 | sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); |
480 | } |
391 | } |
481 | |
392 | |
|
|
393 | // formerly a macro, used only by magic map, so optimised it out |
|
|
394 | static inline faceidx |
|
|
395 | GET_MAP_FACE (maptile *m, int x, int y, int layer) |
|
|
396 | { |
|
|
397 | if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) |
|
|
398 | return op->face; |
|
|
399 | else |
|
|
400 | return 0; |
|
|
401 | } |
482 | |
402 | |
483 | /** |
403 | /** |
484 | * Helper for magic map creation. |
404 | * Helper for magic map creation. |
485 | * |
405 | * |
486 | * Takes a player, the map_mark array and an x and y starting position. |
406 | * Takes a player, the map_mark array and an x and y starting position. |
… | |
… | |
495 | magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) |
415 | magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) |
496 | { |
416 | { |
497 | int x, y, dx, dy, mflags; |
417 | int x, y, dx, dy, mflags; |
498 | sint16 nx, ny; |
418 | sint16 nx, ny; |
499 | maptile *mp; |
419 | maptile *mp; |
500 | New_Face *f; |
|
|
501 | |
420 | |
502 | for (dx = -1; dx <= 1; dx++) |
421 | for (dx = -1; dx <= 1; dx++) |
503 | { |
422 | { |
504 | for (dy = -1; dy <= 1; dy++) |
423 | for (dy = -1; dy <= 1; dy++) |
505 | { |
424 | { |
… | |
… | |
517 | if (mflags & P_OUT_OF_MAP) |
436 | if (mflags & P_OUT_OF_MAP) |
518 | continue; |
437 | continue; |
519 | |
438 | |
520 | if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) |
439 | if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) |
521 | { |
440 | { |
522 | f = GET_MAP_FACE (mp, nx, ny, 0); |
441 | int f = GET_MAP_FACE (mp, nx, ny, 0); |
523 | if (f == blank_face) |
442 | if (f == blank_face) |
|
|
443 | { |
524 | f = GET_MAP_FACE (mp, nx, ny, 1); |
444 | f = GET_MAP_FACE (mp, nx, ny, 1); |
525 | if (f == blank_face) |
445 | if (f == blank_face) |
526 | f = GET_MAP_FACE (mp, nx, ny, 2); |
446 | f = GET_MAP_FACE (mp, nx, ny, 2); |
|
|
447 | } |
|
|
448 | |
|
|
449 | int magicmap = faces [f].magicmap; |
527 | |
450 | |
528 | /* Should probably have P_NO_MAGIC here also, but then shops don't |
451 | /* Should probably have P_NO_MAGIC here also, but then shops don't |
529 | * work. |
452 | * work. |
530 | */ |
453 | */ |
531 | if (mflags & P_BLOCKSVIEW) |
454 | if (mflags & P_BLOCKSVIEW) |
532 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); |
455 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap; |
533 | else |
456 | else |
534 | { |
457 | { |
535 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); |
458 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap; |
536 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
459 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
537 | } |
460 | } |
538 | } |
461 | } |
539 | } |
462 | } |
540 | } |
463 | } |
541 | } |
464 | } |
542 | |
465 | |
543 | |
|
|
544 | /** |
466 | /** |
545 | * Creates magic map for player. |
467 | * Creates magic map for player. |
546 | * |
468 | * |
547 | * Note: For improved magic mapping display, the space that blocks |
469 | * Note: For improved magic mapping display, the space that blocks |
548 | * the view is now marked with value 2. Any dependencies of map_mark |
470 | * the view is now marked with value 2. Any dependencies of map_mark |
549 | * being nonzero have been changed to check for 1. Also, since |
471 | * being nonzero have been changed to check for 1. Also, since |
550 | * map_mark is a char value, putting 2 in should cause no problems. |
472 | * map_mark is a char value, putting 2 in should cause no problems. |
551 | * |
473 | * |
552 | * This function examines the map the player is on, and determines what |
474 | * This function examines the map the player is on, and determines what |
553 | * is visible. 2 is set for walls or objects that blocks view. 1 |
475 | * is visible. 2 is set for walls or objects that blocks view. 1 |
554 | * is for open spaces. map_mark should already have been initialized |
476 | * is for open spaces. map_mark should already have been initialised |
555 | * to zero before this is called. |
477 | * to zero before this is called. |
556 | * strength is an initial strength*2 rectangular area that we automatically |
478 | * strength is an initial strength*2 rectangular area that we automatically |
557 | * see in/penetrate through. |
479 | * see in/penetrate through. |
558 | */ |
480 | */ |
559 | |
|
|
560 | void |
481 | void |
561 | magic_mapping_mark (object *pl, char *map_mark, int strength) |
482 | magic_mapping_mark (object *pl, char *map_mark, int strength) |
562 | { |
483 | { |
563 | int x, y, mflags; |
484 | int x, y, mflags; |
564 | sint16 nx, ny; |
485 | sint16 nx, ny; |
565 | maptile *mp; |
486 | maptile *mp; |
566 | New_Face *f; |
|
|
567 | |
487 | |
568 | for (x = -strength; x < strength; x++) |
488 | for (x = -strength; x < strength; x++) |
569 | { |
489 | { |
570 | for (y = -strength; y < strength; y++) |
490 | for (y = -strength; y < strength; y++) |
571 | { |
491 | { |
572 | mp = pl->map; |
492 | mp = pl->map; |
573 | nx = pl->x + x; |
493 | nx = pl->x + x; |
574 | ny = pl->y + y; |
494 | ny = pl->y + y; |
|
|
495 | |
575 | mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); |
496 | mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); |
576 | if (mflags & P_OUT_OF_MAP) |
497 | if (mflags & P_OUT_OF_MAP) |
577 | continue; |
498 | continue; |
578 | else |
499 | |
|
|
500 | int f = GET_MAP_FACE (mp, nx, ny, 0); |
|
|
501 | if (f == blank_face) |
579 | { |
502 | { |
580 | f = GET_MAP_FACE (mp, nx, ny, 0); |
|
|
581 | if (f == blank_face) |
|
|
582 | f = GET_MAP_FACE (mp, nx, ny, 1); |
503 | f = GET_MAP_FACE (mp, nx, ny, 1); |
583 | if (f == blank_face) |
504 | if (f == blank_face) |
584 | f = GET_MAP_FACE (mp, nx, ny, 2); |
505 | f = GET_MAP_FACE (mp, nx, ny, 2); |
585 | } |
506 | } |
586 | |
507 | |
|
|
508 | int magicmap = faces [f].magicmap; |
|
|
509 | |
587 | if (mflags & P_BLOCKSVIEW) |
510 | if (mflags & P_BLOCKSVIEW) |
588 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); |
511 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap; |
589 | else |
512 | else |
590 | { |
513 | { |
591 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); |
514 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap; |
592 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
515 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
593 | } |
516 | } |
594 | } |
517 | } |
595 | } |
518 | } |
596 | } |
519 | } |
597 | |
520 | |
598 | |
|
|
599 | /** |
521 | /** |
600 | * Creates and sends magic map to player. |
522 | * Creates and sends magic map to player. |
601 | * |
523 | * |
602 | * The following function is a lot messier than it really should be, |
524 | * The following function is a lot messier than it really should be, |
603 | * but there is no real easy solution. |
525 | * but there is no real easy solution. |
604 | * |
526 | * |
605 | * Mark Wedel |
527 | * Mark Wedel |
606 | */ |
528 | */ |
607 | |
|
|
608 | void |
529 | void |
609 | draw_magic_map (object *pl) |
530 | draw_magic_map (object *pl) |
610 | { |
531 | { |
611 | int x, y; |
|
|
612 | char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); |
532 | char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); |
613 | int xmin, xmax, ymin, ymax; |
533 | int xmin, xmax, ymin, ymax; |
614 | SockList sl; |
|
|
615 | |
534 | |
616 | if (pl->type != PLAYER) |
535 | if (pl->type != PLAYER) |
617 | { |
536 | { |
618 | LOG (llevError, "Non player object called draw_map.\n"); |
537 | LOG (llevError, "Non player object called draw_map.\n"); |
619 | return; |
538 | return; |
… | |
… | |
629 | */ |
548 | */ |
630 | xmin = MAGIC_MAP_SIZE; |
549 | xmin = MAGIC_MAP_SIZE; |
631 | ymin = MAGIC_MAP_SIZE; |
550 | ymin = MAGIC_MAP_SIZE; |
632 | xmax = 0; |
551 | xmax = 0; |
633 | ymax = 0; |
552 | ymax = 0; |
|
|
553 | |
634 | for (x = 0; x < MAGIC_MAP_SIZE; x++) |
554 | for (int x = 0; x < MAGIC_MAP_SIZE; x++) |
635 | { |
|
|
636 | for (y = 0; y < MAGIC_MAP_SIZE; y++) |
555 | for (int y = 0; y < MAGIC_MAP_SIZE; y++) |
|
|
556 | if (map_mark[x + pl->map->width * y] | FACE_FLOOR) |
637 | { |
557 | { |
638 | if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) |
|
|
639 | { |
|
|
640 | xmin = x < xmin ? x : xmin; |
558 | xmin = x < xmin ? x : xmin; |
641 | xmax = x > xmax ? x : xmax; |
559 | xmax = x > xmax ? x : xmax; |
642 | ymin = y < ymin ? y : ymin; |
560 | ymin = y < ymin ? y : ymin; |
643 | ymax = y > ymax ? y : ymax; |
561 | ymax = y > ymax ? y : ymax; |
644 | } |
|
|
645 | } |
562 | } |
646 | } |
|
|
647 | |
563 | |
648 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
564 | packet sl; |
649 | snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), |
565 | sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), |
650 | MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); |
566 | MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); |
651 | sl.len = strlen ((char *) sl.buf); |
|
|
652 | |
567 | |
653 | for (y = ymin; y <= ymax; y++) |
568 | for (int y = ymin; y <= ymax; y++) |
654 | { |
|
|
655 | for (x = xmin; x <= xmax; x++) |
569 | for (int x = xmin; x <= xmax; x++) |
656 | { |
|
|
657 | sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; |
570 | sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); |
658 | } /* x loop */ |
|
|
659 | } /* y loop */ |
|
|
660 | |
571 | |
661 | Send_With_Handling (&pl->contr->socket, &sl); |
572 | pl->contr->ns->send_packet (sl); |
662 | free (sl.buf); |
573 | |
663 | free (map_mark); |
574 | free (map_mark); |
664 | } |
575 | } |
665 | |
576 | |
666 | |
|
|
667 | /** |
577 | /** |
668 | * Send a kill log record to sockets |
578 | * Send a kill log record to sockets |
669 | */ |
579 | */ |
670 | |
|
|
671 | void |
580 | void |
672 | Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) |
581 | Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) |
673 | { |
582 | { |
674 | int i; |
|
|
675 | size_t len; |
583 | size_t len; |
676 | char buf[MAX_BUF]; |
584 | char buf[MAX_BUF]; |
677 | |
585 | |
678 | if (With != NULL) |
586 | if (With != NULL) |
679 | snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); |
587 | snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); |
680 | else |
588 | else |
681 | snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); |
589 | snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); |
682 | |
590 | |
683 | len = strlen (buf); |
591 | len = strlen (buf); |
684 | } |
592 | } |
|
|
593 | |