1 | |
|
|
2 | /* |
1 | /* |
3 | CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
4 | |
3 | * |
|
|
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | |
7 | * |
8 | This program is free software; you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | the Free Software Foundation; either version 2 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | (at your option) any later version. |
11 | * 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 Affero GNU General Public License |
19 | along with this program; if not, write to the Free Software |
19 | * and the GNU General Public License along with this program. If not, see |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * <http://www.gnu.org/licenses/>. |
21 | |
21 | * |
22 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | /** |
25 | /** |
26 | * \file |
26 | * \file |
27 | * Basic client output functions. |
27 | * Basic client output functions. |
28 | * |
28 | * |
… | |
… | |
36 | #include <sproto.h> |
36 | #include <sproto.h> |
37 | #include <stdarg.h> |
37 | #include <stdarg.h> |
38 | #include <spells.h> |
38 | #include <spells.h> |
39 | #include <skills.h> |
39 | #include <skills.h> |
40 | |
40 | |
|
|
41 | #include <cstring> |
|
|
42 | |
41 | /** |
43 | /** |
42 | * Draws a normal message on the client. It is pretty |
44 | * Draws a normal message on the client. It is pretty |
43 | * much the same thing as the draw_info above, but takes a color |
45 | * much the same thing as the draw_info above, but takes a color |
44 | * parameter. the esrv_drawinfo functions should probably be |
46 | * parameter. the esrv_drawinfo functions should probably be |
45 | * replaced with this, just using black as the color. |
47 | * replaced with this, just using black as the color. |
46 | */ |
48 | */ |
47 | static void |
49 | static void |
48 | esrv_print_msg (client *ns, int color, const char *str) |
50 | esrv_print_msg (client *ns, int color, const char *str) |
49 | { |
51 | { |
50 | ns->send_packet_printf ("drawinfo %d %s", color, str); |
52 | ns->send_msg (color, "info", str); |
51 | } |
53 | } |
52 | |
54 | |
53 | /** |
55 | /** |
54 | * Draws an extended message on the client. |
56 | * Draws an extended message on the client. |
55 | * ns the socket to send message to |
57 | * ns the socket to send message to |
… | |
… | |
60 | * message The main message |
62 | * message The main message |
61 | */ |
63 | */ |
62 | static void |
64 | static void |
63 | esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message) |
65 | esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message) |
64 | { |
66 | { |
65 | ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); |
67 | ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message); |
66 | } |
68 | } |
67 | |
69 | |
68 | /** |
70 | /** |
69 | * Frontend for esrv_print_msg |
71 | * Frontend for esrv_print_msg |
70 | * \param colr message color |
72 | * \param colr message color |
… | |
… | |
83 | |
85 | |
84 | if (!pl || (pl->type == PLAYER && pl->contr == NULL)) |
86 | if (!pl || (pl->type == PLAYER && pl->contr == NULL)) |
85 | return; |
87 | return; |
86 | |
88 | |
87 | if (pl->type == PLAYER) |
89 | if (pl->type == PLAYER) |
88 | esrv_print_msg (pl->contr->ns, colr, (char *) tmp); |
90 | esrv_print_msg (pl->contr->ns, colr, (char *)tmp); |
89 | } |
91 | } |
90 | |
92 | |
91 | /** |
93 | bool |
92 | * Prints out the contents of specified buffer structures, |
94 | client::msg_suppressed (const char *msg) |
93 | * and clears the string. |
|
|
94 | */ |
|
|
95 | void |
|
|
96 | flush_output_element (const object *pl, Output_Buf * outputs) |
|
|
97 | { |
95 | { |
98 | char tbuf[MAX_BUF]; |
96 | if (!pl) |
99 | |
|
|
100 | if (outputs->buf == NULL) |
|
|
101 | return; |
97 | return false; |
102 | if (outputs->count > 1) |
98 | |
103 | { |
99 | if (pl->outputs_count <= 1 || !pl->outputs_sync) |
104 | snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf); |
100 | return false; |
105 | print_message (NDI_BLACK, pl, tbuf); |
101 | |
|
|
102 | int len = strlen (msg); |
|
|
103 | |
|
|
104 | if (len > MSG_BUF_SIZE) |
|
|
105 | return false; |
|
|
106 | |
|
|
107 | msg_buf *lru = msgbuf; |
|
|
108 | for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf) |
106 | } |
109 | { |
107 | else |
110 | if (len == buf->len && !memcmp (msg, buf->msg, len)) |
108 | print_message (NDI_BLACK, pl, &outputs->buf); |
|
|
109 | |
|
|
110 | outputs->buf = NULL; |
|
|
111 | outputs->first_update = 0; /* This way, it will be reused */ |
|
|
112 | } |
|
|
113 | |
|
|
114 | /** |
|
|
115 | * Sends message to player through output buffers. |
|
|
116 | * \param pl player to send message |
|
|
117 | * \param buf message to send |
|
|
118 | * |
|
|
119 | * If player's output_count is 1, sends message directly. |
|
|
120 | * |
|
|
121 | * Else checks output buffers for specified message. |
|
|
122 | * |
|
|
123 | * If found, checks if message should be sent now. |
|
|
124 | * |
|
|
125 | * If message not already in buffers, flushes olders buffer, |
|
|
126 | * and adds message to queue. |
|
|
127 | */ |
|
|
128 | static void |
|
|
129 | check_output_buffers (const object *pl, const char *buf) |
|
|
130 | { |
|
|
131 | int i, oldest = 0; |
|
|
132 | |
|
|
133 | if (pl->contr->outputs_count < 2) |
|
|
134 | { |
|
|
135 | print_message (NDI_BLACK, pl, buf); |
|
|
136 | return; |
|
|
137 | } |
|
|
138 | else |
|
|
139 | { |
|
|
140 | for (i = 0; i < NUM_OUTPUT_BUFS; i++) |
|
|
141 | { |
111 | { |
142 | if (pl->contr->outputs[i].buf && !strcmp (buf, pl->contr->outputs[i].buf)) |
112 | // found matching buf, see if expired |
|
|
113 | if (buf->expire <= pticks || !buf->count) |
143 | break; |
114 | { |
144 | else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) |
115 | // yes, take over matching buffer, print |
145 | oldest = i; |
116 | buf->expire = pticks + pl->outputs_sync; |
|
|
117 | buf->count = pl->outputs_count; |
|
|
118 | |
|
|
119 | return false; |
|
|
120 | } |
|
|
121 | |
|
|
122 | // no, suppress |
|
|
123 | --buf->count; |
|
|
124 | return true; |
146 | } |
125 | } |
147 | /* We found a match */ |
|
|
148 | if (i < NUM_OUTPUT_BUFS) |
|
|
149 | { |
|
|
150 | pl->contr->outputs[i].count++; |
|
|
151 | if (pl->contr->outputs[i].count >= pl->contr->outputs_count) |
|
|
152 | { |
|
|
153 | flush_output_element (pl, &pl->contr->outputs[i]); |
|
|
154 | } |
|
|
155 | } |
|
|
156 | /* No match - flush the oldest, and put the new one in */ |
|
|
157 | else |
|
|
158 | { |
|
|
159 | flush_output_element (pl, &pl->contr->outputs[oldest]); |
|
|
160 | |
126 | |
161 | pl->contr->outputs[oldest].first_update = pticks; |
127 | if (lru->expire > buf->expire) |
162 | pl->contr->outputs[oldest].count = 1; |
128 | lru = buf; |
163 | pl->contr->outputs[oldest].buf = buf; |
|
|
164 | } |
|
|
165 | } |
129 | } |
|
|
130 | |
|
|
131 | // new message, evoke oldest buffer |
|
|
132 | lru->expire = pticks + pl->outputs_sync; |
|
|
133 | lru->count = pl->outputs_count; |
|
|
134 | lru->len = len; |
|
|
135 | memcpy (lru->msg, msg, len); |
|
|
136 | |
|
|
137 | return false; |
166 | } |
138 | } |
167 | |
139 | |
168 | /** |
140 | /** |
169 | * Sends message to player(s). |
141 | * Sends message to player(s). |
170 | * |
142 | * |
171 | * flags is various flags - mostly color, plus a few specials. |
143 | * flags is various flags - mostly color, plus a few specials. |
172 | * |
144 | * |
173 | * pri is priority. It is a little odd - the lower the value, the more |
145 | * pri is unused. |
174 | * important it is. Thus, 0 gets sent no matter what. Otherwise, the |
|
|
175 | * value must be less than the listening level that the player has set. |
|
|
176 | * Unfortunately, there is no clear guideline on what each level does what. |
|
|
177 | * |
146 | * |
178 | * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set |
147 | * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set |
179 | * in the flags. |
148 | * in the flags. |
180 | * |
149 | * |
181 | * If message is black, and not NDI_UNIQUE, gets sent through output buffers. |
150 | * If message is black, and not NDI_UNIQUE, gets sent through output buffers. |
182 | * |
151 | * |
183 | */ |
152 | */ |
184 | |
|
|
185 | void |
153 | void |
186 | new_draw_info (int flags, int pri, const object *pl, const char *buf) |
154 | new_draw_info (int flags, int pri, const object *op, const char *buf) |
187 | { |
155 | { |
188 | if (flags & NDI_ALL) |
156 | if (flags & NDI_ALL) |
189 | { |
157 | { |
190 | for_all_players (pl) |
158 | for_all_players (pl) |
191 | new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); |
159 | new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf); |
192 | |
|
|
193 | return; |
|
|
194 | } |
160 | } |
195 | |
|
|
196 | if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns) |
|
|
197 | return; |
|
|
198 | |
|
|
199 | if (pri >= pl->contr->listening) |
|
|
200 | return; |
|
|
201 | |
|
|
202 | if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) |
|
|
203 | check_output_buffers (pl, buf); |
|
|
204 | else |
161 | else |
|
|
162 | { |
|
|
163 | if (!op || !op->contr || !op->contr->ns) |
|
|
164 | return; |
|
|
165 | |
|
|
166 | if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK |
|
|
167 | || !op->contr->ns->msg_suppressed (buf)) |
205 | print_message (flags & NDI_COLOR_MASK, pl, buf); |
168 | print_message (flags & NDI_COLOR_MASK, op, buf); |
|
|
169 | } |
206 | } |
170 | } |
207 | |
171 | |
208 | /** |
172 | /** |
209 | * Wrapper for new_draw_info printf-like. |
173 | * Wrapper for new_draw_info printf-like. |
210 | * |
174 | * |
… | |
… | |
214 | * client/server bandwidth (client could keep track of various strings |
178 | * client/server bandwidth (client could keep track of various strings |
215 | */ |
179 | */ |
216 | void |
180 | void |
217 | new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) |
181 | new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) |
218 | { |
182 | { |
219 | char buf[HUGE_BUF]; |
|
|
220 | |
|
|
221 | va_list ap; |
183 | va_list ap; |
222 | va_start (ap, format); |
184 | va_start (ap, format); |
223 | vsnprintf (buf, HUGE_BUF, format, ap); |
185 | new_draw_info (flags, pri, pl, vformat (format, ap)); |
224 | va_end (ap); |
186 | va_end (ap); |
225 | |
|
|
226 | new_draw_info (flags, pri, pl, buf); |
|
|
227 | } |
187 | } |
228 | |
188 | |
229 | void |
189 | void |
230 | draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) |
190 | draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) |
231 | { |
191 | { |
232 | |
|
|
233 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
192 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
234 | return; |
|
|
235 | |
|
|
236 | if (pri >= pl->contr->listening) |
|
|
237 | return; |
193 | return; |
238 | |
194 | |
239 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
195 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
240 | { |
196 | { |
241 | char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); |
197 | char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); |
… | |
… | |
255 | } |
211 | } |
256 | |
212 | |
257 | void |
213 | void |
258 | draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) |
214 | draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) |
259 | { |
215 | { |
|
|
216 | va_list ap; |
|
|
217 | va_start (ap, new_format); |
260 | |
218 | |
261 | char buf[HUGE_BUF]; |
219 | if (!pl || !pl->is_player ()) |
262 | |
|
|
263 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
|
|
264 | return; |
220 | return; |
265 | |
221 | |
266 | if (pri >= pl->contr->listening) |
222 | // TODO: just assume, and rip out? |
267 | return; |
|
|
268 | |
|
|
269 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
223 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
270 | { |
224 | { |
271 | va_list ap; |
|
|
272 | |
|
|
273 | LOG (llevDebug, "Non supported extension text type for client.\n"); |
225 | LOG (llevDebug, "Non supported extension text type for client.\n"); |
274 | va_start (ap, new_format); |
|
|
275 | vsnprintf (buf, HUGE_BUF, old_format, ap); |
|
|
276 | va_end (ap); |
|
|
277 | new_draw_info (flags, pri, pl, buf); |
226 | new_draw_info (flags, pri, pl, vformat (old_format, ap)); |
278 | return; |
|
|
279 | } |
227 | } |
280 | else |
228 | else |
281 | { |
229 | { |
282 | va_list ap; |
230 | char *buf = vformat (new_format, ap); |
283 | |
|
|
284 | va_start (ap, new_format); |
|
|
285 | vsnprintf (buf, HUGE_BUF, new_format, ap); |
|
|
286 | va_end (ap); |
|
|
287 | strip_media_tag (buf); |
231 | strip_media_tag (buf); |
288 | esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf); |
232 | esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf); |
289 | } |
233 | } |
|
|
234 | |
|
|
235 | va_end (ap); |
290 | } |
236 | } |
291 | |
237 | |
292 | /** |
238 | /** |
293 | * Writes to everyone on the map *except* op. This is useful for emotions. |
239 | * Writes to everyone on the map *except* op. This is useful for emotions. |
294 | */ |
240 | */ |
295 | |
|
|
296 | void |
241 | void |
297 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
242 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
298 | { |
243 | { |
299 | player *pl; |
|
|
300 | |
|
|
301 | for_all_players (pl) |
244 | for_all_players (pl) |
302 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
245 | if (pl->ob->map == map && pl->ob != op) |
303 | { |
|
|
304 | new_draw_info (color, 0, pl->ob, str); |
246 | new_draw_info (color, 0, pl->ob, str); |
305 | } |
|
|
306 | } |
247 | } |
307 | |
248 | |
308 | /** |
249 | /** |
309 | * Writes to everyone on the map except op1 and op2 |
250 | * Writes to everyone on the map except op1 and op2 |
310 | */ |
251 | */ |
311 | |
|
|
312 | void |
252 | void |
313 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
253 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
314 | { |
254 | { |
315 | player *pl; |
|
|
316 | |
|
|
317 | for_all_players (pl) |
255 | for_all_players (pl) |
318 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) |
256 | if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2) |
319 | { |
|
|
320 | new_draw_info (color, 0, pl->ob, str); |
257 | new_draw_info (color, 0, pl->ob, str); |
321 | } |
|
|
322 | } |
258 | } |
323 | |
259 | |
324 | /** |
260 | /** |
325 | * Writes to everyone on the specified map |
261 | * Writes to everyone on the specified map |
326 | */ |
262 | */ |
327 | |
|
|
328 | void |
263 | void |
329 | new_info_map (int color, maptile * map, const char *str) |
264 | new_info_map (int color, maptile * map, const char *str) |
330 | { |
265 | { |
331 | player *pl; |
|
|
332 | |
|
|
333 | for_all_players (pl) |
266 | for_all_players (pl) |
334 | if (pl->ob != NULL && pl->ob->map == map) |
267 | if (pl->ob->map == map) |
335 | { |
|
|
336 | new_draw_info (color, 0, pl->ob, str); |
268 | new_draw_info (color, 0, pl->ob, str); |
337 | } |
|
|
338 | } |
|
|
339 | |
|
|
340 | |
|
|
341 | /** |
|
|
342 | * This does nothing now. However, in theory, we should probably send |
|
|
343 | * something to the client and let the client figure out how it might want |
|
|
344 | * to handle this |
|
|
345 | */ |
|
|
346 | void |
|
|
347 | clear_win_info (object *op) |
|
|
348 | { |
|
|
349 | } |
|
|
350 | |
|
|
351 | /** |
|
|
352 | * Get player's current range attack in obuf. |
|
|
353 | */ |
|
|
354 | void |
|
|
355 | rangetostring (object *pl, char *obuf) |
|
|
356 | { |
|
|
357 | switch (pl->contr->shoottype) |
|
|
358 | { |
|
|
359 | case range_none: |
|
|
360 | strcpy (obuf, "Range: nothing"); |
|
|
361 | break; |
|
|
362 | |
|
|
363 | case range_bow: |
|
|
364 | { |
|
|
365 | object *op; |
|
|
366 | |
|
|
367 | for (op = pl->inv; op; op = op->below) |
|
|
368 | if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) |
|
|
369 | break; |
|
|
370 | |
|
|
371 | if (op == NULL) |
|
|
372 | break; |
|
|
373 | |
|
|
374 | sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); |
|
|
375 | } |
|
|
376 | break; |
|
|
377 | |
|
|
378 | case range_magic: |
|
|
379 | if (settings.casting_time == TRUE) |
|
|
380 | { |
|
|
381 | if (pl->casting_time > -1) |
|
|
382 | { |
|
|
383 | if (pl->casting_time == 0) |
|
|
384 | sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name); |
|
|
385 | else |
|
|
386 | sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name); |
|
|
387 | } |
|
|
388 | else |
|
|
389 | sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); |
|
|
390 | } |
|
|
391 | else |
|
|
392 | sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); |
|
|
393 | break; |
|
|
394 | |
|
|
395 | case range_misc: |
|
|
396 | sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none"); |
|
|
397 | break; |
|
|
398 | |
|
|
399 | /* range_scroll is only used for controlling golems. If the |
|
|
400 | * the player does not have a golem, reset some things. |
|
|
401 | */ |
|
|
402 | case range_golem: |
|
|
403 | if (pl->contr->ranges[range_golem] != NULL) |
|
|
404 | sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); |
|
|
405 | else |
|
|
406 | { |
|
|
407 | pl->contr->shoottype = range_none; |
|
|
408 | strcpy (obuf, "Range: nothing"); |
|
|
409 | } |
|
|
410 | break; |
|
|
411 | |
|
|
412 | case range_skill: |
|
|
413 | sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none"); |
|
|
414 | break; |
|
|
415 | |
|
|
416 | case range_builder: |
|
|
417 | sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0)); |
|
|
418 | break; |
|
|
419 | |
|
|
420 | default: |
|
|
421 | strcpy (obuf, "Range: illegal"); |
|
|
422 | } |
|
|
423 | } |
269 | } |
424 | |
270 | |
425 | /** |
271 | /** |
426 | * Sets player title. |
272 | * Sets player title. |
427 | */ |
273 | */ |
… | |
… | |
433 | sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); |
279 | sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); |
434 | else |
280 | else |
435 | sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); |
281 | sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); |
436 | } |
282 | } |
437 | |
283 | |
|
|
284 | // formerly a macro, used only by magic map, so optimised it out |
|
|
285 | static inline faceidx |
|
|
286 | GET_MAP_FACE (mapspace &ms, int layer) |
|
|
287 | { |
|
|
288 | if (object *op = ms.faces_obj [layer]) |
|
|
289 | return op->face; |
|
|
290 | else |
|
|
291 | return 0; |
|
|
292 | } |
438 | |
293 | |
439 | /** |
294 | /** |
440 | * Helper for magic map creation. |
295 | * Helper for magic map creation. |
441 | * |
296 | * |
442 | * Takes a player, the map_mark array and an x and y starting position. |
297 | * Takes a player, the map_mark array and an x and y starting position. |
… | |
… | |
448 | * for various code values. |
303 | * for various code values. |
449 | */ |
304 | */ |
450 | static void |
305 | static void |
451 | magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) |
306 | magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) |
452 | { |
307 | { |
453 | int x, y, dx, dy, mflags; |
|
|
454 | sint16 nx, ny; |
|
|
455 | maptile *mp; |
|
|
456 | New_Face *f; |
|
|
457 | |
|
|
458 | for (dx = -1; dx <= 1; dx++) |
308 | for (int dx = -1; dx <= 1; dx++) |
459 | { |
309 | { |
460 | for (dy = -1; dy <= 1; dy++) |
310 | for (int dy = -1; dy <= 1; dy++) |
461 | { |
311 | { |
462 | x = px + dx; |
312 | int x = px + dx; |
463 | y = py + dy; |
313 | int y = py + dy; |
464 | |
314 | |
465 | if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF) |
315 | if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF) |
466 | continue; |
316 | continue; |
467 | |
317 | |
468 | mp = pl->map; |
318 | mapxy pos (pl); |
469 | nx = pl->x + x; |
319 | pos.move (x, y); |
470 | ny = pl->y + y; |
|
|
471 | |
320 | |
472 | mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); |
321 | if (!pos.normalise ()) |
473 | if (mflags & P_OUT_OF_MAP) |
|
|
474 | continue; |
322 | continue; |
|
|
323 | |
|
|
324 | mapspace &ms = pos.ms (); |
475 | |
325 | |
476 | if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) |
326 | if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) |
477 | { |
327 | { |
|
|
328 | int mflags = ms.flags (); |
|
|
329 | |
478 | f = GET_MAP_FACE (mp, nx, ny, 0); |
330 | int f = GET_MAP_FACE (ms, 0); |
479 | if (f == blank_face) |
331 | if (f == blank_face) |
|
|
332 | { |
480 | f = GET_MAP_FACE (mp, nx, ny, 1); |
333 | f = GET_MAP_FACE (ms, 1); |
481 | if (f == blank_face) |
334 | if (f == blank_face) |
482 | f = GET_MAP_FACE (mp, nx, ny, 2); |
335 | f = GET_MAP_FACE (ms, 2); |
|
|
336 | } |
|
|
337 | |
|
|
338 | int magicmap = faces [f].magicmap; |
483 | |
339 | |
484 | /* Should probably have P_NO_MAGIC here also, but then shops don't |
340 | /* Should probably have P_NO_MAGIC here also, but then shops don't |
485 | * work. |
341 | * work. |
486 | */ |
342 | */ |
487 | if (mflags & P_BLOCKSVIEW) |
343 | if (mflags & P_BLOCKSVIEW) |
488 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); |
344 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap; |
489 | else |
345 | else |
490 | { |
346 | { |
491 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); |
347 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap; |
492 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
348 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
493 | } |
349 | } |
494 | } |
350 | } |
495 | } |
351 | } |
496 | } |
352 | } |
497 | } |
353 | } |
498 | |
354 | |
499 | |
|
|
500 | /** |
355 | /** |
501 | * Creates magic map for player. |
356 | * Creates magic map for player. |
502 | * |
357 | * |
503 | * Note: For improved magic mapping display, the space that blocks |
358 | * Note: For improved magic mapping display, the space that blocks |
504 | * the view is now marked with value 2. Any dependencies of map_mark |
359 | * the view is now marked with value 2. Any dependencies of map_mark |
505 | * being nonzero have been changed to check for 1. Also, since |
360 | * being nonzero have been changed to check for 1. Also, since |
506 | * map_mark is a char value, putting 2 in should cause no problems. |
361 | * map_mark is a char value, putting 2 in should cause no problems. |
507 | * |
362 | * |
508 | * This function examines the map the player is on, and determines what |
363 | * This function examines the map the player is on, and determines what |
509 | * is visible. 2 is set for walls or objects that blocks view. 1 |
364 | * is visible. 2 is set for walls or objects that blocks view. 1 |
510 | * is for open spaces. map_mark should already have been initialised |
365 | * is for open spaces. map_mark should already have been initialised |
511 | * to zero before this is called. |
366 | * to zero before this is called. |
512 | * strength is an initial strength*2 rectangular area that we automatically |
367 | * strength is an initial strength*2 rectangular area that we automatically |
513 | * see in/penetrate through. |
368 | * see in/penetrate through. |
514 | */ |
369 | */ |
515 | |
|
|
516 | void |
370 | void |
517 | magic_mapping_mark (object *pl, char *map_mark, int strength) |
371 | magic_mapping_mark (object *pl, char *map_mark, int strength) |
518 | { |
372 | { |
519 | int x, y, mflags; |
|
|
520 | sint16 nx, ny; |
|
|
521 | maptile *mp; |
|
|
522 | New_Face *f; |
|
|
523 | |
|
|
524 | for (x = -strength; x < strength; x++) |
373 | for (int x = -strength; x < strength; x++) |
525 | { |
374 | { |
526 | for (y = -strength; y < strength; y++) |
375 | for (int y = -strength; y < strength; y++) |
527 | { |
376 | { |
528 | mp = pl->map; |
377 | mapxy pos (pl); |
529 | nx = pl->x + x; |
378 | pos.move (x, y); |
530 | ny = pl->y + y; |
379 | |
531 | mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); |
380 | if (!pos.normalise ()) |
532 | if (mflags & P_OUT_OF_MAP) |
|
|
533 | continue; |
381 | continue; |
|
|
382 | |
|
|
383 | mapspace &ms = pos.ms (); |
|
|
384 | |
|
|
385 | int mflags = ms.flags (); |
|
|
386 | |
|
|
387 | int f = GET_MAP_FACE (ms, 0); |
|
|
388 | if (f == blank_face) |
|
|
389 | { |
|
|
390 | f = GET_MAP_FACE (ms, 1); |
|
|
391 | if (f == blank_face) |
|
|
392 | f = GET_MAP_FACE (ms, 2); |
|
|
393 | } |
|
|
394 | |
|
|
395 | int magicmap = faces [f].magicmap; |
|
|
396 | |
|
|
397 | if (mflags & P_BLOCKSVIEW) |
|
|
398 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap; |
534 | else |
399 | else |
535 | { |
400 | { |
536 | f = GET_MAP_FACE (mp, nx, ny, 0); |
|
|
537 | if (f == blank_face) |
|
|
538 | f = GET_MAP_FACE (mp, nx, ny, 1); |
|
|
539 | if (f == blank_face) |
|
|
540 | f = GET_MAP_FACE (mp, nx, ny, 2); |
|
|
541 | } |
|
|
542 | |
|
|
543 | if (mflags & P_BLOCKSVIEW) |
|
|
544 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); |
|
|
545 | else |
|
|
546 | { |
|
|
547 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); |
401 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap; |
548 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
402 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
549 | } |
403 | } |
550 | } |
404 | } |
551 | } |
405 | } |
552 | } |
406 | } |
… | |
… | |
557 | * The following function is a lot messier than it really should be, |
411 | * The following function is a lot messier than it really should be, |
558 | * but there is no real easy solution. |
412 | * but there is no real easy solution. |
559 | * |
413 | * |
560 | * Mark Wedel |
414 | * Mark Wedel |
561 | */ |
415 | */ |
562 | |
|
|
563 | void |
416 | void |
564 | draw_magic_map (object *pl) |
417 | draw_magic_map (object *pl) |
565 | { |
418 | { |
566 | char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); |
419 | char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); |
567 | int xmin, xmax, ymin, ymax; |
420 | int xmin, xmax, ymin, ymax; |
… | |
… | |
606 | pl->contr->ns->send_packet (sl); |
459 | pl->contr->ns->send_packet (sl); |
607 | |
460 | |
608 | free (map_mark); |
461 | free (map_mark); |
609 | } |
462 | } |
610 | |
463 | |
611 | /** |
|
|
612 | * Send a kill log record to sockets |
|
|
613 | */ |
|
|
614 | void |
|
|
615 | Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) |
|
|
616 | { |
|
|
617 | size_t len; |
|
|
618 | char buf[MAX_BUF]; |
|
|
619 | |
|
|
620 | if (With != NULL) |
|
|
621 | snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); |
|
|
622 | else |
|
|
623 | snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); |
|
|
624 | |
|
|
625 | len = strlen (buf); |
|
|
626 | } |
|
|
627 | |
|
|