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.24 by root, Mon Dec 25 11:25:50 2006 UTC vs.
Revision 1.60 by root, Fri Mar 26 01:04:45 2010 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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 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 */
47static void 49static void
48esrv_print_msg (client *ns, int color, const char *str) 50esrv_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}
52
53/**
54 * Draws an extended message on the client.
55 * ns the socket to send message to
56 * color color informations (used mainly if client does not support message type)
57 * type,
58 * subtype type and subtype of text message
59 * intro Intro message to send with main message if client does not support the message type
60 * message The main message
61 */
62static void
63esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
64{
65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
66} 53}
67 54
68/** 55/**
69 * Frontend for esrv_print_msg 56 * Frontend for esrv_print_msg
70 * \param colr message color 57 * \param colr message color
… …
83 70
84 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 71 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
85 return; 72 return;
86 73
87 if (pl->type == PLAYER) 74 if (pl->type == PLAYER)
88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp); 75 esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
89} 76}
90 77
91/** 78bool
92 * Prints out the contents of specified buffer structures, 79client::msg_suppressed (const char *msg)
93 * and clears the string.
94 */
95void
96flush_output_element (const object *pl, Output_Buf * outputs)
97{ 80{
98 char tbuf[MAX_BUF]; 81 if (!pl)
99
100 if (outputs->buf == NULL)
101 return; 82 return false;
102 if (outputs->count > 1) 83
103 { 84 if (pl->outputs_count <= 1 || !pl->outputs_sync)
104 snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf); 85 return false;
105 print_message (NDI_BLACK, pl, tbuf); 86
87 int len = strlen (msg);
88
89 if (len > MSG_BUF_SIZE)
90 return false;
91
92 msg_buf *lru = msgbuf;
93 for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf)
106 } 94 {
107 else 95 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 { 96 {
142 if (pl->contr->outputs[i].buf && !strcmp (buf, pl->contr->outputs[i].buf)) 97 // found matching buf, see if expired
98 if (buf->expire <= pticks || !buf->count)
143 break; 99 {
144 else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) 100 // yes, take over matching buffer, print
145 oldest = i; 101 buf->expire = pticks + pl->outputs_sync;
102 buf->count = pl->outputs_count;
103
104 return false;
105 }
106
107 // no, suppress
108 --buf->count;
109 return true;
146 } 110 }
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 111
161 pl->contr->outputs[oldest].first_update = pticks; 112 if (lru->expire > buf->expire)
162 pl->contr->outputs[oldest].count = 1; 113 lru = buf;
163 pl->contr->outputs[oldest].buf = buf;
164 }
165 } 114 }
115
116 // new message, evoke oldest buffer
117 lru->expire = pticks + pl->outputs_sync;
118 lru->count = pl->outputs_count;
119 lru->len = len;
120 memcpy (lru->msg, msg, len);
121
122 return false;
166} 123}
167 124
168/** 125/**
169 * Sends message to player(s). 126 * Sends message to player(s).
170 * 127 *
171 * flags is various flags - mostly color, plus a few specials. 128 * flags is various flags - mostly color, plus a few specials.
172 * 129 *
173 * pri is priority. It is a little odd - the lower the value, the more 130 * 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 * 131 *
178 * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set 132 * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set
179 * in the flags. 133 * in the flags.
180 * 134 *
181 * If message is black, and not NDI_UNIQUE, gets sent through output buffers. 135 * If message is black, and not NDI_UNIQUE, gets sent through output buffers.
182 * 136 *
183 */ 137 */
184
185void 138void
186new_draw_info (int flags, int pri, const object *pl, const char *buf) 139new_draw_info (int flags, int pri, const object *op, const char *buf)
187{ 140{
188 if (flags & NDI_ALL) 141 if (flags & NDI_ALL)
189 { 142 {
190 player *tmppl;
191
192 for_all_players (pl) 143 for_all_players (pl)
193 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 144 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 { 145 }
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 146 else
147 {
148 if (!op || !op->contr || !op->contr->ns)
149 return;
150
151 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
152 || !op->contr->ns->msg_suppressed (buf))
215 print_message (flags & NDI_COLOR_MASK, pl, buf); 153 print_message (flags & NDI_COLOR_MASK, op, buf);
154 }
216} 155}
217 156
218/** 157/**
219 * Wrapper for new_draw_info printf-like. 158 * Wrapper for new_draw_info printf-like.
220 * 159 *
… …
224 * client/server bandwidth (client could keep track of various strings 163 * client/server bandwidth (client could keep track of various strings
225 */ 164 */
226void 165void
227new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 166new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
228{ 167{
229 char buf[HUGE_BUF];
230
231 va_list ap; 168 va_list ap;
232
233 va_start (ap, format); 169 va_start (ap, format);
234 170 new_draw_info (flags, pri, pl, vformat (format, ap));
235 vsnprintf (buf, HUGE_BUF, format, ap);
236
237 va_end (ap); 171 va_end (ap);
238
239 new_draw_info (flags, pri, pl, buf);
240}
241
242void
243draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
244{
245
246 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
247 return;
248
249 if (pri >= pl->contr->listening)
250 return;
251
252 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
253 {
254 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
255
256 if (buf == NULL)
257 LOG (llevError, "info::draw_ext_info -> Out of memory!");
258 else
259 {
260 strcpy (buf, oldmessage == NULL ? message : oldmessage);
261 strip_media_tag (buf);
262 new_draw_info (flags, pri, pl, buf);
263 free (buf);
264 }
265 }
266 else
267 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
268}
269
270void
271draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
272{
273
274 char buf[HUGE_BUF];
275
276 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
277 return;
278
279 if (pri >= pl->contr->listening)
280 return;
281
282 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
283 {
284 va_list ap;
285
286 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);
291 return;
292 }
293 else
294 {
295 va_list 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);
301 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
302 }
303} 172}
304 173
305/** 174/**
306 * Writes to everyone on the map *except* op. This is useful for emotions. 175 * Writes to everyone on the map *except* op. This is useful for emotions.
307 */ 176 */
308
309void 177void
310new_info_map_except (int color, maptile * map, object *op, const char *str) 178new_info_map_except (int color, maptile * map, object *op, const char *str)
311{ 179{
312 player *pl;
313
314 for_all_players (pl) 180 for_all_players (pl)
315 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 181 if (pl->ob->map == map && pl->ob != op)
316 {
317 new_draw_info (color, 0, pl->ob, str); 182 new_draw_info (color, 0, pl->ob, str);
318 }
319} 183}
320 184
321/** 185/**
322 * Writes to everyone on the map except op1 and op2 186 * Writes to everyone on the specified map
323 */ 187 */
324
325void 188void
326new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 189new_info_map (int color, maptile * map, const char *str)
327{ 190{
328 player *pl;
329
330 for_all_players (pl) 191 for_all_players (pl)
331 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 192 if (pl->ob->map == map)
332 {
333 new_draw_info (color, 0, pl->ob, str); 193 new_draw_info (color, 0, pl->ob, str);
334 }
335}
336
337/**
338 * Writes to everyone on the specified map
339 */
340
341void
342new_info_map (int color, maptile * map, const char *str)
343{
344 player *pl;
345
346 for_all_players (pl)
347 if (pl->ob != NULL && pl->ob->map == map)
348 {
349 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} 194}
437 195
438/** 196/**
439 * Sets player title. 197 * Sets player title.
440 */ 198 */
… …
446 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); 204 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
447 else 205 else
448 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 206 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
449} 207}
450 208
209// formerly a macro, used only by magic map, so optimised it out
210static inline faceidx
211GET_MAP_FACE (mapspace &ms, int layer)
212{
213 if (object *op = ms.faces_obj [layer])
214 return op->face;
215 else
216 return 0;
217}
451 218
452/** 219/**
453 * Helper for magic map creation. 220 * Helper for magic map creation.
454 * 221 *
455 * Takes a player, the map_mark array and an x and y starting position. 222 * Takes a player, the map_mark array and an x and y starting position.
… …
461 * for various code values. 228 * for various code values.
462 */ 229 */
463static void 230static void
464magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 231magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
465{ 232{
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++) 233 for (int dx = -1; dx <= 1; dx++)
472 { 234 {
473 for (dy = -1; dy <= 1; dy++) 235 for (int dy = -1; dy <= 1; dy++)
474 { 236 {
475 x = px + dx; 237 int x = px + dx;
476 y = py + dy; 238 int y = py + dy;
477 239
478 if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF) 240 if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF)
479 continue; 241 continue;
480 242
481 mp = pl->map; 243 mapxy pos (pl);
482 nx = pl->x + x; 244 pos.move (x, y);
483 ny = pl->y + y;
484 245
485 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 246 if (!pos.normalise ())
486 if (mflags & P_OUT_OF_MAP)
487 continue; 247 continue;
248
249 mapspace &ms = pos.ms ();
488 250
489 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 251 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
490 { 252 {
253 int mflags = ms.flags ();
254
491 f = GET_MAP_FACE (mp, nx, ny, 0); 255 int f = GET_MAP_FACE (ms, 0);
492 if (f == blank_face) 256 if (f == blank_face)
257 {
493 f = GET_MAP_FACE (mp, nx, ny, 1); 258 f = GET_MAP_FACE (ms, 1);
494 if (f == blank_face) 259 if (f == blank_face)
495 f = GET_MAP_FACE (mp, nx, ny, 2); 260 f = GET_MAP_FACE (ms, 2);
261 }
262
263 int magicmap = faces [f].magicmap;
496 264
497 /* Should probably have P_NO_MAGIC here also, but then shops don't 265 /* Should probably have P_NO_MAGIC here also, but then shops don't
498 * work. 266 * work.
499 */ 267 */
500 if (mflags & P_BLOCKSVIEW) 268 if (mflags & P_BLOCKSVIEW)
501 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 269 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
502 else 270 else
503 { 271 {
504 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 272 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); 273 magic_mapping_mark_recursive (pl, map_mark, x, y);
506 } 274 }
507 } 275 }
508 } 276 }
509 } 277 }
510} 278}
511 279
512
513/** 280/**
514 * Creates magic map for player. 281 * Creates magic map for player.
515 * 282 *
516 * Note: For improved magic mapping display, the space that blocks 283 * Note: For improved magic mapping display, the space that blocks
517 * the view is now marked with value 2. Any dependencies of map_mark 284 * 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 285 * 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. 286 * map_mark is a char value, putting 2 in should cause no problems.
520 * 287 *
521 * This function examines the map the player is on, and determines what 288 * 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 289 * 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 290 * is for open spaces. map_mark should already have been initialised
524 * to zero before this is called. 291 * to zero before this is called.
525 * strength is an initial strength*2 rectangular area that we automatically 292 * strength is an initial strength*2 rectangular area that we automatically
526 * see in/penetrate through. 293 * see in/penetrate through.
527 */ 294 */
528 295static void
529void
530magic_mapping_mark (object *pl, char *map_mark, int strength) 296magic_mapping_mark (object *pl, char *map_mark, int strength)
531{ 297{
532 int x, y, mflags;
533 sint16 nx, ny;
534 maptile *mp;
535 New_Face *f;
536
537 for (x = -strength; x < strength; x++) 298 for (int x = -strength; x < strength; x++)
538 { 299 {
539 for (y = -strength; y < strength; y++) 300 for (int y = -strength; y < strength; y++)
540 { 301 {
541 mp = pl->map; 302 mapxy pos (pl);
542 nx = pl->x + x; 303 pos.move (x, y);
543 ny = pl->y + y; 304
544 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 305 if (!pos.normalise ())
545 if (mflags & P_OUT_OF_MAP)
546 continue; 306 continue;
307
308 mapspace &ms = pos.ms ();
309
310 int mflags = ms.flags ();
311
312 int f = GET_MAP_FACE (ms, 0);
313 if (f == blank_face)
314 {
315 f = GET_MAP_FACE (ms, 1);
316 if (f == blank_face)
317 f = GET_MAP_FACE (ms, 2);
318 }
319
320 int magicmap = faces [f].magicmap;
321
322 if (mflags & P_BLOCKSVIEW)
323 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
547 else 324 else
548 { 325 {
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); 326 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); 327 magic_mapping_mark_recursive (pl, map_mark, x, y);
562 } 328 }
563 } 329 }
564 } 330 }
565} 331}
… …
570 * The following function is a lot messier than it really should be, 336 * The following function is a lot messier than it really should be,
571 * but there is no real easy solution. 337 * but there is no real easy solution.
572 * 338 *
573 * Mark Wedel 339 * Mark Wedel
574 */ 340 */
575
576void 341void
577draw_magic_map (object *pl) 342draw_magic_map (object *pl)
578{ 343{
579 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 344 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
580 int xmin, xmax, ymin, ymax; 345 int xmin, xmax, ymin, ymax;
… …
598 xmax = 0; 363 xmax = 0;
599 ymax = 0; 364 ymax = 0;
600 365
601 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 366 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
602 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 367 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
603 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 368 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
604 { 369 {
605 xmin = x < xmin ? x : xmin; 370 xmin = x < xmin ? x : xmin;
606 xmax = x > xmax ? x : xmax; 371 xmax = x > xmax ? x : xmax;
607 ymin = y < ymin ? y : ymin; 372 ymin = y < ymin ? y : ymin;
608 ymax = y > ymax ? y : ymax; 373 ymax = y > ymax ? y : ymax;
… …
619 pl->contr->ns->send_packet (sl); 384 pl->contr->ns->send_packet (sl);
620 385
621 free (map_mark); 386 free (map_mark);
622} 387}
623 388
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