1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
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 |
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 3 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, see <http://www.gnu.org/licenses/>. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
|
21 | * |
20 | * |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | /** |
24 | /** |
26 | * \file |
25 | * \file |
27 | * Basic client output functions. |
26 | * Basic client output functions. |
… | |
… | |
36 | #include <sproto.h> |
35 | #include <sproto.h> |
37 | #include <stdarg.h> |
36 | #include <stdarg.h> |
38 | #include <spells.h> |
37 | #include <spells.h> |
39 | #include <skills.h> |
38 | #include <skills.h> |
40 | |
39 | |
|
|
40 | #include <cstring> |
|
|
41 | |
41 | /** |
42 | /** |
42 | * Draws a normal message on the client. It is pretty |
43 | * Draws a normal message on the client. It is pretty |
43 | * much the same thing as the draw_info above, but takes a color |
44 | * much the same thing as the draw_info above, but takes a color |
44 | * parameter. the esrv_drawinfo functions should probably be |
45 | * parameter. the esrv_drawinfo functions should probably be |
45 | * replaced with this, just using black as the color. |
46 | * replaced with this, just using black as the color. |
46 | */ |
47 | */ |
47 | static void |
48 | static void |
48 | esrv_print_msg (client *ns, int color, const char *str) |
49 | esrv_print_msg (client *ns, int color, const char *str) |
49 | { |
50 | { |
50 | ns->send_packet_printf ("drawinfo %d %s", color, str); |
51 | ns->send_msg (color, "info", str); |
51 | } |
52 | } |
52 | |
53 | |
53 | /** |
54 | /** |
54 | * Draws an extended message on the client. |
55 | * Draws an extended message on the client. |
55 | * ns the socket to send message to |
56 | * ns the socket to send message to |
… | |
… | |
60 | * message The main message |
61 | * message The main message |
61 | */ |
62 | */ |
62 | static void |
63 | static void |
63 | esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message) |
64 | esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message) |
64 | { |
65 | { |
65 | ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); |
66 | ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message); |
66 | } |
67 | } |
67 | |
68 | |
68 | /** |
69 | /** |
69 | * Frontend for esrv_print_msg |
70 | * Frontend for esrv_print_msg |
70 | * \param colr message color |
71 | * \param colr message color |
… | |
… | |
83 | |
84 | |
84 | if (!pl || (pl->type == PLAYER && pl->contr == NULL)) |
85 | if (!pl || (pl->type == PLAYER && pl->contr == NULL)) |
85 | return; |
86 | return; |
86 | |
87 | |
87 | if (pl->type == PLAYER) |
88 | if (pl->type == PLAYER) |
88 | esrv_print_msg (pl->contr->ns, colr, (char *) tmp); |
89 | esrv_print_msg (pl->contr->ns, colr, (char *)tmp); |
89 | } |
90 | } |
90 | |
91 | |
91 | /** |
92 | bool |
92 | * Prints out the contents of specified buffer structures, |
93 | 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 | { |
94 | { |
98 | char tbuf[MAX_BUF]; |
95 | if (!pl) |
99 | |
|
|
100 | if (outputs->buf == NULL) |
|
|
101 | return; |
96 | return false; |
102 | if (outputs->count > 1) |
97 | |
103 | { |
98 | if (pl->outputs_count <= 1 || !pl->outputs_sync) |
104 | snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf); |
99 | return false; |
105 | print_message (NDI_BLACK, pl, tbuf); |
100 | |
|
|
101 | int len = strlen (msg); |
|
|
102 | |
|
|
103 | if (len > MSG_BUF_SIZE) |
|
|
104 | return false; |
|
|
105 | |
|
|
106 | msg_buf *lru = msgbuf; |
|
|
107 | for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf) |
106 | } |
108 | { |
107 | else |
109 | 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 | { |
110 | { |
142 | if (pl->contr->outputs[i].buf && !strcmp (buf, pl->contr->outputs[i].buf)) |
111 | // found matching buf, see if expired |
|
|
112 | if (buf->expire <= pticks || !buf->count) |
143 | break; |
113 | { |
144 | else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) |
114 | // yes, take over matching buffer, print |
145 | oldest = i; |
115 | buf->expire = pticks + pl->outputs_sync; |
|
|
116 | buf->count = pl->outputs_count; |
|
|
117 | |
|
|
118 | return false; |
|
|
119 | } |
|
|
120 | |
|
|
121 | // no, suppress |
|
|
122 | --buf->count; |
|
|
123 | return true; |
146 | } |
124 | } |
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 | |
125 | |
161 | pl->contr->outputs[oldest].first_update = pticks; |
126 | if (lru->expire > buf->expire) |
162 | pl->contr->outputs[oldest].count = 1; |
127 | lru = buf; |
163 | pl->contr->outputs[oldest].buf = buf; |
|
|
164 | } |
|
|
165 | } |
128 | } |
|
|
129 | |
|
|
130 | // new message, evoke oldest buffer |
|
|
131 | lru->expire = pticks + pl->outputs_sync; |
|
|
132 | lru->count = pl->outputs_count; |
|
|
133 | lru->len = len; |
|
|
134 | memcpy (lru->msg, msg, len); |
|
|
135 | |
|
|
136 | return false; |
166 | } |
137 | } |
167 | |
138 | |
168 | /** |
139 | /** |
169 | * Sends message to player(s). |
140 | * Sends message to player(s). |
170 | * |
141 | * |
171 | * flags is various flags - mostly color, plus a few specials. |
142 | * flags is various flags - mostly color, plus a few specials. |
172 | * |
143 | * |
173 | * pri is priority. It is a little odd - the lower the value, the more |
144 | * 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 | * |
145 | * |
178 | * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set |
146 | * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set |
179 | * in the flags. |
147 | * in the flags. |
180 | * |
148 | * |
181 | * If message is black, and not NDI_UNIQUE, gets sent through output buffers. |
149 | * If message is black, and not NDI_UNIQUE, gets sent through output buffers. |
182 | * |
150 | * |
183 | */ |
151 | */ |
184 | |
|
|
185 | void |
152 | void |
186 | new_draw_info (int flags, int pri, const object *pl, const char *buf) |
153 | new_draw_info (int flags, int pri, const object *op, const char *buf) |
187 | { |
154 | { |
188 | if (flags & NDI_ALL) |
155 | if (flags & NDI_ALL) |
189 | { |
156 | { |
190 | for_all_players (pl) |
157 | for_all_players (pl) |
191 | new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); |
158 | new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf); |
192 | |
|
|
193 | return; |
|
|
194 | } |
159 | } |
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 |
160 | else |
|
|
161 | { |
|
|
162 | if (!op || !op->contr || !op->contr->ns) |
|
|
163 | return; |
|
|
164 | |
|
|
165 | if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK |
|
|
166 | || !op->contr->ns->msg_suppressed (buf)) |
205 | print_message (flags & NDI_COLOR_MASK, pl, buf); |
167 | print_message (flags & NDI_COLOR_MASK, op, buf); |
|
|
168 | } |
206 | } |
169 | } |
207 | |
170 | |
208 | /** |
171 | /** |
209 | * Wrapper for new_draw_info printf-like. |
172 | * Wrapper for new_draw_info printf-like. |
210 | * |
173 | * |
… | |
… | |
229 | void |
192 | void |
230 | draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) |
193 | draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) |
231 | { |
194 | { |
232 | |
195 | |
233 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
196 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
234 | return; |
|
|
235 | |
|
|
236 | if (pri >= pl->contr->listening) |
|
|
237 | return; |
197 | return; |
238 | |
198 | |
239 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
199 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
240 | { |
200 | { |
241 | char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); |
201 | char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); |
… | |
… | |
260 | char buf[HUGE_BUF]; |
220 | char buf[HUGE_BUF]; |
261 | |
221 | |
262 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
222 | if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) |
263 | return; |
223 | return; |
264 | |
224 | |
265 | if (pri >= pl->contr->listening) |
|
|
266 | return; |
|
|
267 | |
|
|
268 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
225 | if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) |
269 | { |
226 | { |
270 | va_list ap; |
227 | va_list ap; |
271 | |
228 | |
272 | LOG (llevDebug, "Non supported extension text type for client.\n"); |
229 | LOG (llevDebug, "Non supported extension text type for client.\n"); |
… | |
… | |
294 | |
251 | |
295 | void |
252 | void |
296 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
253 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
297 | { |
254 | { |
298 | for_all_players (pl) |
255 | for_all_players (pl) |
299 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
256 | if (pl->ob->map == map && pl->ob != op) |
300 | new_draw_info (color, 0, pl->ob, str); |
257 | new_draw_info (color, 0, pl->ob, str); |
301 | } |
258 | } |
302 | |
259 | |
303 | /** |
260 | /** |
304 | * Writes to everyone on the map except op1 and op2 |
261 | * Writes to everyone on the map except op1 and op2 |
305 | */ |
262 | */ |
306 | |
|
|
307 | void |
263 | void |
308 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
264 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
309 | { |
265 | { |
310 | for_all_players (pl) |
266 | for_all_players (pl) |
311 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) |
267 | if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2) |
312 | new_draw_info (color, 0, pl->ob, str); |
268 | new_draw_info (color, 0, pl->ob, str); |
313 | } |
269 | } |
314 | |
270 | |
315 | /** |
271 | /** |
316 | * Writes to everyone on the specified map |
272 | * Writes to everyone on the specified map |
317 | */ |
273 | */ |
318 | |
|
|
319 | void |
274 | void |
320 | new_info_map (int color, maptile * map, const char *str) |
275 | new_info_map (int color, maptile * map, const char *str) |
321 | { |
276 | { |
322 | for_all_players (pl) |
277 | for_all_players (pl) |
323 | if (pl->ob != NULL && pl->ob->map == map) |
278 | if (pl->ob->map == map) |
324 | new_draw_info (color, 0, pl->ob, str); |
279 | new_draw_info (color, 0, pl->ob, str); |
325 | } |
|
|
326 | |
|
|
327 | /** |
|
|
328 | * This does nothing now. However, in theory, we should probably send |
|
|
329 | * something to the client and let the client figure out how it might want |
|
|
330 | * to handle this |
|
|
331 | */ |
|
|
332 | void |
|
|
333 | clear_win_info (object *op) |
|
|
334 | { |
|
|
335 | } |
|
|
336 | |
|
|
337 | /** |
|
|
338 | * Get player's current range attack in obuf. |
|
|
339 | */ |
|
|
340 | void |
|
|
341 | rangetostring (object *pl, char *obuf) |
|
|
342 | { |
|
|
343 | switch (pl->contr->shoottype) |
|
|
344 | { |
|
|
345 | case range_none: |
|
|
346 | strcpy (obuf, "Range: nothing"); |
|
|
347 | break; |
|
|
348 | |
|
|
349 | case range_bow: |
|
|
350 | { |
|
|
351 | object *op; |
|
|
352 | |
|
|
353 | for (op = pl->inv; op; op = op->below) |
|
|
354 | if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) |
|
|
355 | break; |
|
|
356 | |
|
|
357 | if (op == NULL) |
|
|
358 | break; |
|
|
359 | |
|
|
360 | sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); |
|
|
361 | } |
|
|
362 | break; |
|
|
363 | |
|
|
364 | case range_magic: |
|
|
365 | if (settings.casting_time == TRUE) |
|
|
366 | { |
|
|
367 | if (pl->casting_time > -1) |
|
|
368 | { |
|
|
369 | if (pl->casting_time == 0) |
|
|
370 | sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name); |
|
|
371 | else |
|
|
372 | sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name); |
|
|
373 | } |
|
|
374 | else |
|
|
375 | sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); |
|
|
376 | } |
|
|
377 | else |
|
|
378 | sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); |
|
|
379 | break; |
|
|
380 | |
|
|
381 | case range_misc: |
|
|
382 | sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none"); |
|
|
383 | break; |
|
|
384 | |
|
|
385 | /* range_scroll is only used for controlling golems. If the |
|
|
386 | * the player does not have a golem, reset some things. |
|
|
387 | */ |
|
|
388 | case range_golem: |
|
|
389 | if (pl->contr->ranges[range_golem] != NULL) |
|
|
390 | sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); |
|
|
391 | else |
|
|
392 | { |
|
|
393 | pl->contr->shoottype = range_none; |
|
|
394 | strcpy (obuf, "Range: nothing"); |
|
|
395 | } |
|
|
396 | break; |
|
|
397 | |
|
|
398 | case range_skill: |
|
|
399 | sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none"); |
|
|
400 | break; |
|
|
401 | |
|
|
402 | case range_builder: |
|
|
403 | sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0)); |
|
|
404 | break; |
|
|
405 | |
|
|
406 | default: |
|
|
407 | strcpy (obuf, "Range: illegal"); |
|
|
408 | } |
|
|
409 | } |
280 | } |
410 | |
281 | |
411 | /** |
282 | /** |
412 | * Sets player title. |
283 | * Sets player title. |
413 | */ |
284 | */ |
… | |
… | |
419 | sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); |
290 | sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); |
420 | else |
291 | else |
421 | sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); |
292 | sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); |
422 | } |
293 | } |
423 | |
294 | |
|
|
295 | // formerly a macro, used only by magic map, so optimised it out |
|
|
296 | static inline faceidx |
|
|
297 | GET_MAP_FACE (maptile *m, int x, int y, int layer) |
|
|
298 | { |
|
|
299 | if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) |
|
|
300 | return op->face; |
|
|
301 | else |
|
|
302 | return 0; |
|
|
303 | } |
424 | |
304 | |
425 | /** |
305 | /** |
426 | * Helper for magic map creation. |
306 | * Helper for magic map creation. |
427 | * |
307 | * |
428 | * Takes a player, the map_mark array and an x and y starting position. |
308 | * Takes a player, the map_mark array and an x and y starting position. |
… | |
… | |
437 | magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) |
317 | magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) |
438 | { |
318 | { |
439 | int x, y, dx, dy, mflags; |
319 | int x, y, dx, dy, mflags; |
440 | sint16 nx, ny; |
320 | sint16 nx, ny; |
441 | maptile *mp; |
321 | maptile *mp; |
442 | facetile *f; |
|
|
443 | |
322 | |
444 | for (dx = -1; dx <= 1; dx++) |
323 | for (dx = -1; dx <= 1; dx++) |
445 | { |
324 | { |
446 | for (dy = -1; dy <= 1; dy++) |
325 | for (dy = -1; dy <= 1; dy++) |
447 | { |
326 | { |
… | |
… | |
459 | if (mflags & P_OUT_OF_MAP) |
338 | if (mflags & P_OUT_OF_MAP) |
460 | continue; |
339 | continue; |
461 | |
340 | |
462 | if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) |
341 | if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) |
463 | { |
342 | { |
464 | f = GET_MAP_FACE (mp, nx, ny, 0); |
343 | int f = GET_MAP_FACE (mp, nx, ny, 0); |
465 | if (f == blank_face) |
344 | if (f == blank_face) |
|
|
345 | { |
466 | f = GET_MAP_FACE (mp, nx, ny, 1); |
346 | f = GET_MAP_FACE (mp, nx, ny, 1); |
467 | if (f == blank_face) |
347 | if (f == blank_face) |
468 | f = GET_MAP_FACE (mp, nx, ny, 2); |
348 | f = GET_MAP_FACE (mp, nx, ny, 2); |
|
|
349 | } |
|
|
350 | |
|
|
351 | int magicmap = faces [f].magicmap; |
469 | |
352 | |
470 | /* Should probably have P_NO_MAGIC here also, but then shops don't |
353 | /* Should probably have P_NO_MAGIC here also, but then shops don't |
471 | * work. |
354 | * work. |
472 | */ |
355 | */ |
473 | if (mflags & P_BLOCKSVIEW) |
356 | if (mflags & P_BLOCKSVIEW) |
474 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); |
357 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap; |
475 | else |
358 | else |
476 | { |
359 | { |
477 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); |
360 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap; |
478 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
361 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
479 | } |
362 | } |
480 | } |
363 | } |
481 | } |
364 | } |
482 | } |
365 | } |
483 | } |
366 | } |
484 | |
|
|
485 | |
367 | |
486 | /** |
368 | /** |
487 | * Creates magic map for player. |
369 | * Creates magic map for player. |
488 | * |
370 | * |
489 | * Note: For improved magic mapping display, the space that blocks |
371 | * Note: For improved magic mapping display, the space that blocks |
… | |
… | |
496 | * is for open spaces. map_mark should already have been initialised |
378 | * is for open spaces. map_mark should already have been initialised |
497 | * to zero before this is called. |
379 | * to zero before this is called. |
498 | * strength is an initial strength*2 rectangular area that we automatically |
380 | * strength is an initial strength*2 rectangular area that we automatically |
499 | * see in/penetrate through. |
381 | * see in/penetrate through. |
500 | */ |
382 | */ |
501 | |
|
|
502 | void |
383 | void |
503 | magic_mapping_mark (object *pl, char *map_mark, int strength) |
384 | magic_mapping_mark (object *pl, char *map_mark, int strength) |
504 | { |
385 | { |
505 | int x, y, mflags; |
386 | int x, y, mflags; |
506 | sint16 nx, ny; |
387 | sint16 nx, ny; |
507 | maptile *mp; |
388 | maptile *mp; |
508 | facetile *f; |
|
|
509 | |
389 | |
510 | for (x = -strength; x < strength; x++) |
390 | for (x = -strength; x < strength; x++) |
511 | { |
391 | { |
512 | for (y = -strength; y < strength; y++) |
392 | for (y = -strength; y < strength; y++) |
513 | { |
393 | { |
514 | mp = pl->map; |
394 | mp = pl->map; |
515 | nx = pl->x + x; |
395 | nx = pl->x + x; |
516 | ny = pl->y + y; |
396 | ny = pl->y + y; |
|
|
397 | |
517 | mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); |
398 | mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); |
518 | if (mflags & P_OUT_OF_MAP) |
399 | if (mflags & P_OUT_OF_MAP) |
519 | continue; |
400 | continue; |
520 | else |
401 | |
|
|
402 | int f = GET_MAP_FACE (mp, nx, ny, 0); |
|
|
403 | if (f == blank_face) |
521 | { |
404 | { |
522 | f = GET_MAP_FACE (mp, nx, ny, 0); |
|
|
523 | if (f == blank_face) |
|
|
524 | f = GET_MAP_FACE (mp, nx, ny, 1); |
405 | f = GET_MAP_FACE (mp, nx, ny, 1); |
525 | if (f == blank_face) |
406 | if (f == blank_face) |
526 | f = GET_MAP_FACE (mp, nx, ny, 2); |
407 | f = GET_MAP_FACE (mp, nx, ny, 2); |
527 | } |
408 | } |
528 | |
409 | |
|
|
410 | int magicmap = faces [f].magicmap; |
|
|
411 | |
529 | if (mflags & P_BLOCKSVIEW) |
412 | if (mflags & P_BLOCKSVIEW) |
530 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); |
413 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap; |
531 | else |
414 | else |
532 | { |
415 | { |
533 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); |
416 | map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap; |
534 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
417 | magic_mapping_mark_recursive (pl, map_mark, x, y); |
535 | } |
418 | } |
536 | } |
419 | } |
537 | } |
420 | } |
538 | } |
421 | } |
… | |
… | |
591 | pl->contr->ns->send_packet (sl); |
474 | pl->contr->ns->send_packet (sl); |
592 | |
475 | |
593 | free (map_mark); |
476 | free (map_mark); |
594 | } |
477 | } |
595 | |
478 | |
596 | /** |
|
|
597 | * Send a kill log record to sockets |
|
|
598 | */ |
|
|
599 | void |
|
|
600 | Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) |
|
|
601 | { |
|
|
602 | size_t len; |
|
|
603 | char buf[MAX_BUF]; |
|
|
604 | |
|
|
605 | if (With != NULL) |
|
|
606 | snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); |
|
|
607 | else |
|
|
608 | snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); |
|
|
609 | |
|
|
610 | len = strlen (buf); |
|
|
611 | } |
|
|
612 | |
|
|