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 | player *tmppl; |
|
|
191 | |
|
|
192 | for_all_players (pl) |
158 | for_all_players (pl) |
193 | new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); |
159 | new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf); |
194 | |
|
|
195 | return; |
|
|
196 | } |
|
|
197 | |
|
|
198 | if (!pl || (pl->type == PLAYER && pl->contr == NULL)) |
|
|
199 | { |
160 | } |
200 | /* Write to the socket? */ |
|
|
201 | print_message (0, NULL, buf); |
|
|
202 | return; |
|
|
203 | } |
|
|
204 | |
|
|
205 | if (pl->type != PLAYER) |
|
|
206 | return; |
|
|
207 | |
|
|
208 | if (pri >= pl->contr->listening) |
|
|
209 | return; |
|
|
210 | |
|
|
211 | if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) |
|
|
212 | /* following prints stuff out, as appropriate */ |
|
|
213 | check_output_buffers (pl, buf); |
|
|
214 | 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)) |
215 | print_message (flags & NDI_COLOR_MASK, pl, buf); |
168 | print_message (flags & NDI_COLOR_MASK, op, buf); |
|
|
169 | } |
216 | } |
170 | } |
217 | |
171 | |
218 | /** |
172 | /** |
219 | * Wrapper for new_draw_info printf-like. |
173 | * Wrapper for new_draw_info printf-like. |
220 | * |
174 | * |
… | |
… | |
224 | * client/server bandwidth (client could keep track of various strings |
178 | * client/server bandwidth (client could keep track of various strings |
225 | */ |
179 | */ |
226 | void |
180 | void |
227 | 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, ...) |
228 | { |
182 | { |
229 | char buf[HUGE_BUF]; |
|
|
230 | |
|
|
231 | va_list ap; |
183 | va_list ap; |
232 | |
|
|
233 | va_start (ap, format); |
184 | va_start (ap, format); |
234 | |
185 | new_draw_info (flags, pri, pl, vformat (format, ap)); |
235 | vsnprintf (buf, HUGE_BUF, format, ap); |
|
|
236 | |
|
|
237 | va_end (ap); |
186 | va_end (ap); |
238 | |
|
|
239 | new_draw_info (flags, pri, pl, buf); |
|
|
240 | } |
187 | } |
241 | |
188 | |
242 | void |
189 | void |
243 | 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) |
244 | { |
191 | { |
245 | |
|
|
246 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
192 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
247 | return; |
|
|
248 | |
|
|
249 | if (pri >= pl->contr->listening) |
|
|
250 | return; |
193 | return; |
251 | |
194 | |
252 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
195 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
253 | { |
196 | { |
254 | char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); |
197 | char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); |
… | |
… | |
268 | } |
211 | } |
269 | |
212 | |
270 | void |
213 | void |
271 | 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, ...) |
272 | { |
215 | { |
|
|
216 | va_list ap; |
|
|
217 | va_start (ap, new_format); |
273 | |
218 | |
274 | char buf[HUGE_BUF]; |
219 | if (!pl || !pl->is_player ()) |
275 | |
|
|
276 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
|
|
277 | return; |
220 | return; |
278 | |
221 | |
279 | if (pri >= pl->contr->listening) |
222 | // TODO: just assume, and rip out? |
280 | return; |
|
|
281 | |
|
|
282 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
223 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
283 | { |
224 | { |
284 | va_list ap; |
|
|
285 | |
|
|
286 | LOG (llevDebug, "Non supported extension text type for client.\n"); |
225 | LOG (llevDebug, "Non supported extension text type for client.\n"); |
287 | va_start (ap, new_format); |
|
|
288 | vsnprintf (buf, HUGE_BUF, old_format, ap); |
|
|
289 | va_end (ap); |
|
|
290 | new_draw_info (flags, pri, pl, buf); |
226 | new_draw_info (flags, pri, pl, vformat (old_format, ap)); |
291 | return; |
|
|
292 | } |
227 | } |
293 | else |
228 | else |
294 | { |
229 | { |
295 | va_list ap; |
230 | char *buf = vformat (new_format, ap); |
296 | |
|
|
297 | va_start (ap, new_format); |
|
|
298 | vsnprintf (buf, HUGE_BUF, new_format, ap); |
|
|
299 | va_end (ap); |
|
|
300 | strip_media_tag (buf); |
231 | strip_media_tag (buf); |
301 | 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); |
302 | } |
233 | } |
|
|
234 | |
|
|
235 | va_end (ap); |
303 | } |
236 | } |
304 | |
237 | |
305 | /** |
238 | /** |
306 | * 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. |
307 | */ |
240 | */ |
308 | |
|
|
309 | void |
241 | void |
310 | 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) |
311 | { |
243 | { |
312 | player *pl; |
|
|
313 | |
|
|
314 | for_all_players (pl) |
244 | for_all_players (pl) |
315 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
245 | if (pl->ob->map == map && pl->ob != op) |
316 | { |
|
|
317 | new_draw_info (color, 0, pl->ob, str); |
246 | new_draw_info (color, 0, pl->ob, str); |
318 | } |
|
|
319 | } |
247 | } |
320 | |
248 | |
321 | /** |
249 | /** |
322 | * Writes to everyone on the map except op1 and op2 |
250 | * Writes to everyone on the map except op1 and op2 |
323 | */ |
251 | */ |
324 | |
252 | static void |
325 | void |
|
|
326 | 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) |
327 | { |
254 | { |
328 | player *pl; |
|
|
329 | |
|
|
330 | for_all_players (pl) |
255 | for_all_players (pl) |
331 | 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) |
332 | { |
|
|
333 | new_draw_info (color, 0, pl->ob, str); |
257 | new_draw_info (color, 0, pl->ob, str); |
334 | } |
|
|
335 | } |
258 | } |
336 | |
259 | |
337 | /** |
260 | /** |
338 | * Writes to everyone on the specified map |
261 | * Writes to everyone on the specified map |
339 | */ |
262 | */ |
340 | |
|
|
341 | void |
263 | void |
342 | new_info_map (int color, maptile * map, const char *str) |
264 | new_info_map (int color, maptile * map, const char *str) |
343 | { |
265 | { |
344 | player *pl; |
|
|
345 | |
|
|
346 | for_all_players (pl) |
266 | for_all_players (pl) |
347 | if (pl->ob != NULL && pl->ob->map == map) |
267 | if (pl->ob->map == map) |
348 | { |
|
|
349 | new_draw_info (color, 0, pl->ob, str); |
268 | new_draw_info (color, 0, pl->ob, str); |
350 | } |
|
|
351 | } |
|
|
352 | |
|
|
353 | |
|
|
354 | /** |
|
|
355 | * This does nothing now. However, in theory, we should probably send |
|
|
356 | * something to the client and let the client figure out how it might want |
|
|
357 | * to handle this |
|
|
358 | */ |
|
|
359 | void |
|
|
360 | clear_win_info (object *op) |
|
|
361 | { |
|
|
362 | } |
|
|
363 | |
|
|
364 | /** |
|
|
365 | * Get player's current range attack in obuf. |
|
|
366 | */ |
|
|
367 | void |
|
|
368 | rangetostring (object *pl, char *obuf) |
|
|
369 | { |
|
|
370 | switch (pl->contr->shoottype) |
|
|
371 | { |
|
|
372 | case range_none: |
|
|
373 | strcpy (obuf, "Range: nothing"); |
|
|
374 | break; |
|
|
375 | |
|
|
376 | case range_bow: |
|
|
377 | { |
|
|
378 | object *op; |
|
|
379 | |
|
|
380 | for (op = pl->inv; op; op = op->below) |
|
|
381 | if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) |
|
|
382 | break; |
|
|
383 | |
|
|
384 | if (op == NULL) |
|
|
385 | break; |
|
|
386 | |
|
|
387 | sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); |
|
|
388 | } |
|
|
389 | break; |
|
|
390 | |
|
|
391 | case range_magic: |
|
|
392 | if (settings.casting_time == TRUE) |
|
|
393 | { |
|
|
394 | if (pl->casting_time > -1) |
|
|
395 | { |
|
|
396 | if (pl->casting_time == 0) |
|
|
397 | sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name); |
|
|
398 | else |
|
|
399 | sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name); |
|
|
400 | } |
|
|
401 | else |
|
|
402 | sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); |
|
|
403 | } |
|
|
404 | else |
|
|
405 | sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); |
|
|
406 | break; |
|
|
407 | |
|
|
408 | case range_misc: |
|
|
409 | sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none"); |
|
|
410 | break; |
|
|
411 | |
|
|
412 | /* range_scroll is only used for controlling golems. If the |
|
|
413 | * the player does not have a golem, reset some things. |
|
|
414 | */ |
|
|
415 | case range_golem: |
|
|
416 | if (pl->contr->ranges[range_golem] != NULL) |
|
|
417 | sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); |
|
|
418 | else |
|
|
419 | { |
|
|
420 | pl->contr->shoottype = range_none; |
|
|
421 | strcpy (obuf, "Range: nothing"); |
|
|
422 | } |
|
|
423 | break; |
|
|
424 | |
|
|
425 | case range_skill: |
|
|
426 | sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none"); |
|
|
427 | break; |
|
|
428 | |
|
|
429 | case range_builder: |
|
|
430 | sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0)); |
|
|
431 | break; |
|
|
432 | |
|
|
433 | default: |
|
|
434 | strcpy (obuf, "Range: illegal"); |
|
|
435 | } |
|
|
436 | } |
269 | } |
437 | |
270 | |
438 | /** |
271 | /** |
439 | * Sets player title. |
272 | * Sets player title. |
440 | */ |
273 | */ |
… | |
… | |
446 | 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); |
447 | else |
280 | else |
448 | 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); |
449 | } |
282 | } |
450 | |
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 | } |
451 | |
293 | |
452 | /** |
294 | /** |
453 | * Helper for magic map creation. |
295 | * Helper for magic map creation. |
454 | * |
296 | * |
455 | * 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. |
… | |
… | |
461 | * for various code values. |
303 | * for various code values. |
462 | */ |
304 | */ |
463 | static void |
305 | static void |
464 | 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) |
465 | { |
307 | { |
466 | int x, y, dx, dy, mflags; |
|
|
467 | sint16 nx, ny; |
|
|
468 | maptile *mp; |
|
|
469 | New_Face *f; |
|
|
470 | |
|
|
471 | for (dx = -1; dx <= 1; dx++) |
308 | for (int dx = -1; dx <= 1; dx++) |
472 | { |
309 | { |
473 | for (dy = -1; dy <= 1; dy++) |
310 | for (int dy = -1; dy <= 1; dy++) |
474 | { |
311 | { |
475 | x = px + dx; |
312 | int x = px + dx; |
476 | y = py + dy; |
313 | int y = py + dy; |
477 | |
314 | |
478 | if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF) |
315 | if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF) |
479 | continue; |
316 | continue; |
480 | |
317 | |
481 | mp = pl->map; |
318 | mapxy pos (pl); |
482 | nx = pl->x + x; |
319 | pos.move (x, y); |
483 | ny = pl->y + y; |
|
|
484 | |
320 | |
485 | mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); |
321 | if (!pos.normalise ()) |
486 | if (mflags & P_OUT_OF_MAP) |
|
|
487 | continue; |
322 | continue; |
|
|
323 | |
|
|
324 | mapspace &ms = pos.ms (); |
488 | |
325 | |
489 | 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) |
490 | { |
327 | { |
|
|
328 | int mflags = ms.flags (); |
|
|
329 | |
491 | f = GET_MAP_FACE (mp, nx, ny, 0); |
330 | int f = GET_MAP_FACE (ms, 0); |
492 | if (f == blank_face) |
331 | if (f == blank_face) |
|
|
332 | { |
493 | f = GET_MAP_FACE (mp, nx, ny, 1); |
333 | f = GET_MAP_FACE (ms, 1); |
494 | if (f == blank_face) |
334 | if (f == blank_face) |
495 | f = GET_MAP_FACE (mp, nx, ny, 2); |
335 | f = GET_MAP_FACE (ms, 2); |
|
|
336 | } |
|
|
337 | |
|
|
338 | int magicmap = faces [f].magicmap; |
496 | |
339 | |
497 | /* 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 |
498 | * work. |
341 | * work. |
499 | */ |
342 | */ |
500 | if (mflags & P_BLOCKSVIEW) |
343 | if (mflags & P_BLOCKSVIEW) |
501 | 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; |
502 | else |
345 | else |
503 | { |
346 | { |
504 | 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; |
505 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
348 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
506 | } |
349 | } |
507 | } |
350 | } |
508 | } |
351 | } |
509 | } |
352 | } |
510 | } |
353 | } |
511 | |
354 | |
512 | |
|
|
513 | /** |
355 | /** |
514 | * Creates magic map for player. |
356 | * Creates magic map for player. |
515 | * |
357 | * |
516 | * Note: For improved magic mapping display, the space that blocks |
358 | * Note: For improved magic mapping display, the space that blocks |
517 | * 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 |
518 | * being nonzero have been changed to check for 1. Also, since |
360 | * being nonzero have been changed to check for 1. Also, since |
519 | * 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. |
520 | * |
362 | * |
521 | * 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 |
522 | * 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 |
523 | * is for open spaces. map_mark should already have been initialized |
365 | * is for open spaces. map_mark should already have been initialised |
524 | * to zero before this is called. |
366 | * to zero before this is called. |
525 | * strength is an initial strength*2 rectangular area that we automatically |
367 | * strength is an initial strength*2 rectangular area that we automatically |
526 | * see in/penetrate through. |
368 | * see in/penetrate through. |
527 | */ |
369 | */ |
528 | |
370 | static void |
529 | void |
|
|
530 | magic_mapping_mark (object *pl, char *map_mark, int strength) |
371 | magic_mapping_mark (object *pl, char *map_mark, int strength) |
531 | { |
372 | { |
532 | int x, y, mflags; |
|
|
533 | sint16 nx, ny; |
|
|
534 | maptile *mp; |
|
|
535 | New_Face *f; |
|
|
536 | |
|
|
537 | for (x = -strength; x < strength; x++) |
373 | for (int x = -strength; x < strength; x++) |
538 | { |
374 | { |
539 | for (y = -strength; y < strength; y++) |
375 | for (int y = -strength; y < strength; y++) |
540 | { |
376 | { |
541 | mp = pl->map; |
377 | mapxy pos (pl); |
542 | nx = pl->x + x; |
378 | pos.move (x, y); |
543 | ny = pl->y + y; |
379 | |
544 | mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); |
380 | if (!pos.normalise ()) |
545 | if (mflags & P_OUT_OF_MAP) |
|
|
546 | 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; |
547 | else |
399 | else |
548 | { |
400 | { |
549 | f = GET_MAP_FACE (mp, nx, ny, 0); |
|
|
550 | if (f == blank_face) |
|
|
551 | f = GET_MAP_FACE (mp, nx, ny, 1); |
|
|
552 | if (f == blank_face) |
|
|
553 | f = GET_MAP_FACE (mp, nx, ny, 2); |
|
|
554 | } |
|
|
555 | |
|
|
556 | if (mflags & P_BLOCKSVIEW) |
|
|
557 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); |
|
|
558 | else |
|
|
559 | { |
|
|
560 | 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; |
561 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
402 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
562 | } |
403 | } |
563 | } |
404 | } |
564 | } |
405 | } |
565 | } |
406 | } |
… | |
… | |
570 | * 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, |
571 | * but there is no real easy solution. |
412 | * but there is no real easy solution. |
572 | * |
413 | * |
573 | * Mark Wedel |
414 | * Mark Wedel |
574 | */ |
415 | */ |
575 | |
|
|
576 | void |
416 | void |
577 | draw_magic_map (object *pl) |
417 | draw_magic_map (object *pl) |
578 | { |
418 | { |
579 | 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); |
580 | int xmin, xmax, ymin, ymax; |
420 | int xmin, xmax, ymin, ymax; |
… | |
… | |
598 | xmax = 0; |
438 | xmax = 0; |
599 | ymax = 0; |
439 | ymax = 0; |
600 | |
440 | |
601 | for (int x = 0; x < MAGIC_MAP_SIZE; x++) |
441 | for (int x = 0; x < MAGIC_MAP_SIZE; x++) |
602 | for (int y = 0; y < MAGIC_MAP_SIZE; y++) |
442 | for (int y = 0; y < MAGIC_MAP_SIZE; y++) |
603 | if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) |
443 | if (map_mark[x + pl->map->width * y] | FACE_FLOOR) |
604 | { |
444 | { |
605 | xmin = x < xmin ? x : xmin; |
445 | xmin = x < xmin ? x : xmin; |
606 | xmax = x > xmax ? x : xmax; |
446 | xmax = x > xmax ? x : xmax; |
607 | ymin = y < ymin ? y : ymin; |
447 | ymin = y < ymin ? y : ymin; |
608 | ymax = y > ymax ? y : ymax; |
448 | ymax = y > ymax ? y : ymax; |
… | |
… | |
619 | pl->contr->ns->send_packet (sl); |
459 | pl->contr->ns->send_packet (sl); |
620 | |
460 | |
621 | free (map_mark); |
461 | free (map_mark); |
622 | } |
462 | } |
623 | |
463 | |
624 | /** |
|
|
625 | * Send a kill log record to sockets |
|
|
626 | */ |
|
|
627 | void |
|
|
628 | Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) |
|
|
629 | { |
|
|
630 | size_t len; |
|
|
631 | char buf[MAX_BUF]; |
|
|
632 | |
|
|
633 | if (With != NULL) |
|
|
634 | snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); |
|
|
635 | else |
|
|
636 | snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); |
|
|
637 | |
|
|
638 | len = strlen (buf); |
|
|
639 | } |
|
|
640 | |
|
|