ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/info.C
(Generate patch)

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.23 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.51 by root, Fri Aug 29 02:07:10 2008 UTC

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
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. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Basic client output functions. 26 * Basic client output functions.
28 * 27 *
… …
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 */
47static void 48static void
48esrv_print_msg (client *ns, int color, const char *str) 49esrv_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 */
62static void 63static void
63esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message) 64esrv_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/** 92bool
92 * Prints out the contents of specified buffer structures, 93client::msg_suppressed (const char *msg)
93 * and clears the string.
94 */
95void
96flush_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 */
128static void
129check_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
185void 152void
186new_draw_info (int flags, int pri, const object *pl, const char *buf) 153new_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 player *tmppl; 157 for_all_players (pl)
191
192 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
193 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 158 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 { 159 }
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 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))
215 print_message (flags & NDI_COLOR_MASK, pl, buf); 167 print_message (flags & NDI_COLOR_MASK, op, buf);
168 }
216} 169}
217 170
218/** 171/**
219 * Wrapper for new_draw_info printf-like. 172 * Wrapper for new_draw_info printf-like.
220 * 173 *
… …
227new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 180new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
228{ 181{
229 char buf[HUGE_BUF]; 182 char buf[HUGE_BUF];
230 183
231 va_list ap; 184 va_list ap;
232
233 va_start (ap, format); 185 va_start (ap, format);
234
235 vsnprintf (buf, HUGE_BUF, format, ap); 186 vsnprintf (buf, HUGE_BUF, format, ap);
236
237 va_end (ap); 187 va_end (ap);
238 188
239 new_draw_info (flags, pri, pl, buf); 189 new_draw_info (flags, pri, pl, buf);
240} 190}
241 191
242void 192void
243draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) 193draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
244{ 194{
245 195
246 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 196 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
247 return;
248
249 if (pri >= pl->contr->listening)
250 return; 197 return;
251 198
252 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) 199 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
253 { 200 {
254 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 201 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
… …
268} 215}
269 216
270void 217void
271draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 218draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
272{ 219{
273
274 char buf[HUGE_BUF]; 220 char buf[HUGE_BUF];
275 221
276 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 222 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
277 return;
278
279 if (pri >= pl->contr->listening)
280 return; 223 return;
281 224
282 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) 225 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
283 { 226 {
284 va_list ap; 227 va_list ap;
… …
307 */ 250 */
308 251
309void 252void
310new_info_map_except (int color, maptile * map, object *op, const char *str) 253new_info_map_except (int color, maptile * map, object *op, const char *str)
311{ 254{
312 player *pl; 255 for_all_players (pl)
313
314 for (pl = first_player; pl != NULL; pl = pl->next)
315 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 256 if (pl->ob->map == map && pl->ob != op)
316 {
317 new_draw_info (color, 0, pl->ob, str); 257 new_draw_info (color, 0, pl->ob, str);
318 }
319} 258}
320 259
321/** 260/**
322 * Writes to everyone on the map except op1 and op2 261 * Writes to everyone on the map except op1 and op2
323 */ 262 */
324
325void 263void
326new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 264new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
327{ 265{
328 player *pl; 266 for_all_players (pl)
329
330 for (pl = first_player; pl != NULL; pl = pl->next)
331 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)
332 {
333 new_draw_info (color, 0, pl->ob, str); 268 new_draw_info (color, 0, pl->ob, str);
334 }
335} 269}
336 270
337/** 271/**
338 * Writes to everyone on the specified map 272 * Writes to everyone on the specified map
339 */ 273 */
340
341void 274void
342new_info_map (int color, maptile * map, const char *str) 275new_info_map (int color, maptile * map, const char *str)
343{ 276{
344 player *pl; 277 for_all_players (pl)
345
346 for (pl = first_player; pl != NULL; pl = pl->next)
347 if (pl->ob != NULL && pl->ob->map == map) 278 if (pl->ob->map == map)
348 {
349 new_draw_info (color, 0, pl->ob, str); 279 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 */
359void
360clear_win_info (object *op)
361{
362}
363
364/**
365 * Get player's current range attack in obuf.
366 */
367void
368rangetostring (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} 280}
437 281
438/** 282/**
439 * Sets player title. 283 * Sets player title.
440 */ 284 */
… …
446 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);
447 else 291 else
448 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);
449} 293}
450 294
295// formerly a macro, used only by magic map, so optimised it out
296static inline faceidx
297GET_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}
451 304
452/** 305/**
453 * Helper for magic map creation. 306 * Helper for magic map creation.
454 * 307 *
455 * 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.
… …
464magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 317magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
465{ 318{
466 int x, y, dx, dy, mflags; 319 int x, y, dx, dy, mflags;
467 sint16 nx, ny; 320 sint16 nx, ny;
468 maptile *mp; 321 maptile *mp;
469 New_Face *f;
470 322
471 for (dx = -1; dx <= 1; dx++) 323 for (dx = -1; dx <= 1; dx++)
472 { 324 {
473 for (dy = -1; dy <= 1; dy++) 325 for (dy = -1; dy <= 1; dy++)
474 { 326 {
… …
486 if (mflags & P_OUT_OF_MAP) 338 if (mflags & P_OUT_OF_MAP)
487 continue; 339 continue;
488 340
489 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)
490 { 342 {
491 f = GET_MAP_FACE (mp, nx, ny, 0); 343 int f = GET_MAP_FACE (mp, nx, ny, 0);
492 if (f == blank_face) 344 if (f == blank_face)
345 {
493 f = GET_MAP_FACE (mp, nx, ny, 1); 346 f = GET_MAP_FACE (mp, nx, ny, 1);
494 if (f == blank_face) 347 if (f == blank_face)
495 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;
496 352
497 /* 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
498 * work. 354 * work.
499 */ 355 */
500 if (mflags & P_BLOCKSVIEW) 356 if (mflags & P_BLOCKSVIEW)
501 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;
502 else 358 else
503 { 359 {
504 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;
505 magic_mapping_mark_recursive (pl, map_mark, x, y); 361 magic_mapping_mark_recursive (pl, map_mark, x, y);
506 } 362 }
507 } 363 }
508 } 364 }
509 } 365 }
510} 366}
511 367
512
513/** 368/**
514 * Creates magic map for player. 369 * Creates magic map for player.
515 * 370 *
516 * Note: For improved magic mapping display, the space that blocks 371 * Note: For improved magic mapping display, the space that blocks
517 * the view is now marked with value 2. Any dependencies of map_mark 372 * 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 373 * 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. 374 * map_mark is a char value, putting 2 in should cause no problems.
520 * 375 *
521 * This function examines the map the player is on, and determines what 376 * 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 377 * 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 378 * is for open spaces. map_mark should already have been initialised
524 * to zero before this is called. 379 * to zero before this is called.
525 * strength is an initial strength*2 rectangular area that we automatically 380 * strength is an initial strength*2 rectangular area that we automatically
526 * see in/penetrate through. 381 * see in/penetrate through.
527 */ 382 */
528
529void 383void
530magic_mapping_mark (object *pl, char *map_mark, int strength) 384magic_mapping_mark (object *pl, char *map_mark, int strength)
531{ 385{
532 int x, y, mflags; 386 int x, y, mflags;
533 sint16 nx, ny; 387 sint16 nx, ny;
534 maptile *mp; 388 maptile *mp;
535 New_Face *f;
536 389
537 for (x = -strength; x < strength; x++) 390 for (x = -strength; x < strength; x++)
538 { 391 {
539 for (y = -strength; y < strength; y++) 392 for (y = -strength; y < strength; y++)
540 { 393 {
541 mp = pl->map; 394 mp = pl->map;
542 nx = pl->x + x; 395 nx = pl->x + x;
543 ny = pl->y + y; 396 ny = pl->y + y;
397
544 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 398 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
545 if (mflags & P_OUT_OF_MAP) 399 if (mflags & P_OUT_OF_MAP)
546 continue; 400 continue;
547 else 401
402 int f = GET_MAP_FACE (mp, nx, ny, 0);
403 if (f == blank_face)
548 { 404 {
549 f = GET_MAP_FACE (mp, nx, ny, 0);
550 if (f == blank_face)
551 f = GET_MAP_FACE (mp, nx, ny, 1); 405 f = GET_MAP_FACE (mp, nx, ny, 1);
552 if (f == blank_face) 406 if (f == blank_face)
553 f = GET_MAP_FACE (mp, nx, ny, 2); 407 f = GET_MAP_FACE (mp, nx, ny, 2);
554 } 408 }
555 409
410 int magicmap = faces [f].magicmap;
411
556 if (mflags & P_BLOCKSVIEW) 412 if (mflags & P_BLOCKSVIEW)
557 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;
558 else 414 else
559 { 415 {
560 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;
561 magic_mapping_mark_recursive (pl, map_mark, x, y); 417 magic_mapping_mark_recursive (pl, map_mark, x, y);
562 } 418 }
563 } 419 }
564 } 420 }
565} 421}
… …
570 * The following function is a lot messier than it really should be, 426 * The following function is a lot messier than it really should be,
571 * but there is no real easy solution. 427 * but there is no real easy solution.
572 * 428 *
573 * Mark Wedel 429 * Mark Wedel
574 */ 430 */
575
576void 431void
577draw_magic_map (object *pl) 432draw_magic_map (object *pl)
578{ 433{
579 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 434 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
580 int xmin, xmax, ymin, ymax; 435 int xmin, xmax, ymin, ymax;
… …
598 xmax = 0; 453 xmax = 0;
599 ymax = 0; 454 ymax = 0;
600 455
601 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 456 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
602 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 457 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
603 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 458 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
604 { 459 {
605 xmin = x < xmin ? x : xmin; 460 xmin = x < xmin ? x : xmin;
606 xmax = x > xmax ? x : xmax; 461 xmax = x > xmax ? x : xmax;
607 ymin = y < ymin ? y : ymin; 462 ymin = y < ymin ? y : ymin;
608 ymax = y > ymax ? y : ymax; 463 ymax = y > ymax ? y : ymax;
… …
619 pl->contr->ns->send_packet (sl); 474 pl->contr->ns->send_packet (sl);
620 475
621 free (map_mark); 476 free (map_mark);
622} 477}
623 478
624/**
625 * Send a kill log record to sockets
626 */
627void
628Log_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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines