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.14 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.38 by root, Wed Apr 25 18:47:51 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
4 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Basic client output functions. 27 * Basic client output functions.
28 * 28 *
… …
43 * much the same thing as the draw_info above, but takes a color 43 * much the same thing as the draw_info above, but takes a color
44 * parameter. the esrv_drawinfo functions should probably be 44 * parameter. the esrv_drawinfo functions should probably be
45 * replaced with this, just using black as the color. 45 * replaced with this, just using black as the color.
46 */ 46 */
47static void 47static void
48esrv_print_msg (NewSocket * ns, int color, const char *str) 48esrv_print_msg (client *ns, int color, const char *str)
49{ 49{
50 SockList sl (MAXSOCKBUF);
51
52 if (ns->status == Ns_Old)
53 sl.printf ("%s\n", str);
54 else
55 sl.printf ("drawinfo %d %s", color, str); 50 ns->send_packet_printf ("drawinfo %d %s", color, str);
56
57 ns->send_packet (sl);
58 sl.free ();
59} 51}
60 52
61/** 53/**
62 * Draws an extended message on the client. 54 * Draws an extended message on the client.
63 * ns the socket to send message to 55 * ns the socket to send message to
… …
66 * subtype type and subtype of text message 58 * subtype type and subtype of text message
67 * intro Intro message to send with main message if client does not support the message type 59 * intro Intro message to send with main message if client does not support the message type
68 * message The main message 60 * message The main message
69 */ 61 */
70static void 62static void
71esrv_print_ext_msg (NewSocket * ns, int color, uint8 type, uint8 subtype, const char *message) 63esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
72{ 64{
73 SockList sl (MAXSOCKBUF);
74
75 sl.printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
76 ns->send_packet (sl);
77 sl.free ();
78} 66}
79 67
80/** 68/**
81 * Frontend for esrv_print_msg 69 * Frontend for esrv_print_msg
82 * \param colr message color 70 * \param colr message color
… …
85 * 73 *
86 * If pl is NULL or without contr set, writes message to log. 74 * If pl is NULL or without contr set, writes message to log.
87 * 75 *
88 * Else sends message to player via esrv_print_msg 76 * Else sends message to player via esrv_print_msg
89 */ 77 */
90
91static void 78static void
92print_message (int colr, const object *pl, const char *tmp) 79print_message (int colr, const object *pl, const char *tmp)
93{ 80{
94
95 if (!tmp) 81 if (!tmp)
96 tmp = "[NULL]"; 82 tmp = "[NULL]";
97 83
98 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
99 return; 85 return;
100 86
101 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
102 {
103 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
104 return; 89}
90
91bool
92client::msg_suppressed (const char *msg)
93{
94 if (!pl)
95 return false;
96
97 if (pl->outputs_count <= 1 || !pl->outputs_sync)
98 return false;
99
100 int len = strlen (msg);
101
102 if (len > MSG_BUF_SIZE)
103 return false;
104
105 msg_buf *lru = msgbuf;
106 for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf)
105 } 107 {
106} 108 if (len == buf->len && !memcmp (msg, buf->msg, len))
107
108/**
109 * Prints out the contents of specified buffer structures,
110 * and clears the string.
111 */
112
113void
114flush_output_element (const object *pl, Output_Buf * outputs)
115{
116 char tbuf[MAX_BUF];
117
118 if (outputs->buf == NULL)
119 return;
120 if (outputs->count > 1)
121 {
122 snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf);
123 print_message (NDI_BLACK, pl, tbuf);
124 }
125 else
126 print_message (NDI_BLACK, pl, &outputs->buf);
127
128 outputs->buf = NULL;
129 outputs->first_update = 0; /* This way, it will be reused */
130}
131
132/**
133 * Sends message to player through output buffers.
134 * \param pl player to send message
135 * \param buf message to send
136 *
137 * If player's output_count is 1, sends message directly.
138 *
139 * Else checks output buffers for specified message.
140 *
141 * If found, checks if message should be sent now.
142 *
143 * If message not already in buffers, flushes olders buffer,
144 * and adds message to queue.
145 */
146
147static void
148check_output_buffers (const object *pl, const char *buf)
149{
150 int i, oldest = 0;
151
152 if (pl->contr->outputs_count < 2)
153 {
154 print_message (NDI_BLACK, pl, buf);
155 return;
156 }
157 else
158 {
159 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
160 { 109 {
161 if (pl->contr->outputs[i].buf && !strcmp (buf, pl->contr->outputs[i].buf)) 110 // found matching buf, see if expired
111 if (buf->expire <= pticks || !buf->count)
162 break; 112 {
163 else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) 113 // yes, take over matching buffer, print
164 oldest = i; 114 buf->expire = pticks + pl->outputs_sync;
115 buf->count = pl->outputs_count;
116
117 return false;
118 }
119
120 // no, suppress
121 --buf->count;
122 return true;
165 } 123 }
166 /* We found a match */
167 if (i < NUM_OUTPUT_BUFS)
168 {
169 pl->contr->outputs[i].count++;
170 if (pl->contr->outputs[i].count >= pl->contr->outputs_count)
171 {
172 flush_output_element (pl, &pl->contr->outputs[i]);
173 }
174 }
175 /* No match - flush the oldest, and put the new one in */
176 else
177 {
178 flush_output_element (pl, &pl->contr->outputs[oldest]);
179 124
180 pl->contr->outputs[oldest].first_update = pticks; 125 if (lru->expire > buf->expire)
181 pl->contr->outputs[oldest].count = 1; 126 lru = buf;
182 pl->contr->outputs[oldest].buf = buf;
183 }
184 } 127 }
185}
186 128
129 // new message, evoke oldest buffer
130 lru->expire = pticks + pl->outputs_sync;
131 lru->count = pl->outputs_count;
132 lru->len = len;
133 memcpy (lru->msg, msg, len);
187 134
135 return false;
136}
188 137
189/** 138/**
190 * Sends message to player(s). 139 * Sends message to player(s).
191 * 140 *
192 * flags is various flags - mostly color, plus a few specials. 141 * flags is various flags - mostly color, plus a few specials.
… …
200 * in the flags. 149 * in the flags.
201 * 150 *
202 * If message is black, and not NDI_UNIQUE, gets sent through output buffers. 151 * If message is black, and not NDI_UNIQUE, gets sent through output buffers.
203 * 152 *
204 */ 153 */
205
206void 154void
207new_draw_info (int flags, int pri, const object *pl, const char *buf) 155new_draw_info (int flags, int pri, const object *pl, const char *buf)
208{ 156{
209
210 if (flags & NDI_ALL) 157 if (flags & NDI_ALL)
211 { 158 {
212 player *tmppl; 159 for_all_players (pl)
213
214 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
215 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 160 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
216 161
217 return; 162 return;
218 } 163 }
219 164
220 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 165 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
221 {
222 /* Write to the socket? */
223 print_message (0, NULL, buf);
224 return;
225 }
226
227 if (pl->type != PLAYER)
228 return; 166 return;
229 167
230 if (pri >= pl->contr->listening) 168 if (pri >= pl->contr->listening)
231 return; 169 return;
232 170
233 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 171 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
234 /* following prints stuff out, as appropriate */ 172 || !pl->contr->ns->msg_suppressed (buf))
235 check_output_buffers (pl, buf);
236 else
237 print_message (flags & NDI_COLOR_MASK, pl, buf); 173 print_message (flags & NDI_COLOR_MASK, pl, buf);
238} 174}
239 175
240/** 176/**
241 * Wrapper for new_draw_info printf-like. 177 * Wrapper for new_draw_info printf-like.
… …
243 * This is a pretty trivial function, but it allows us to use printf style 179 * This is a pretty trivial function, but it allows us to use printf style
244 * formatting, so instead of the calling function having to do it, we do 180 * formatting, so instead of the calling function having to do it, we do
245 * it here. It may also have advantages in the future for reduction of 181 * it here. It may also have advantages in the future for reduction of
246 * client/server bandwidth (client could keep track of various strings 182 * client/server bandwidth (client could keep track of various strings
247 */ 183 */
248
249void 184void
250new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 185new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
251{ 186{
252 char buf[HUGE_BUF]; 187 char buf[HUGE_BUF];
253 188
254 va_list ap; 189 va_list ap;
255
256 va_start (ap, format); 190 va_start (ap, format);
257
258 vsnprintf (buf, HUGE_BUF, format, ap); 191 vsnprintf (buf, HUGE_BUF, format, ap);
259
260 va_end (ap); 192 va_end (ap);
261 193
262 new_draw_info (flags, pri, pl, buf); 194 new_draw_info (flags, pri, pl, buf);
263} 195}
264 196
265
266void 197void
267draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) 198draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
268{ 199{
269 200
270 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 201 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
271 return; 202 return;
272 203
273 if (pri >= pl->contr->listening) 204 if (pri >= pl->contr->listening)
274 return; 205 return;
206
275 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 207 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
276 { 208 {
277 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 209 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
278 210
279 if (buf == NULL) 211 if (buf == NULL)
280 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 212 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
285 new_draw_info (flags, pri, pl, buf); 217 new_draw_info (flags, pri, pl, buf);
286 free (buf); 218 free (buf);
287 } 219 }
288 } 220 }
289 else 221 else
290 {
291 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message); 222 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
292 }
293} 223}
294 224
295void 225void
296draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 226draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
297{ 227{
298
299 char buf[HUGE_BUF]; 228 char buf[HUGE_BUF];
300 229
301 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 230 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
302 return; 231 return;
303 232
304 if (pri >= pl->contr->listening) 233 if (pri >= pl->contr->listening)
305 return; 234 return;
235
306 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 236 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
307 { 237 {
308 va_list ap; 238 va_list ap;
309 239
310 LOG (llevDebug, "Non supported extension text type for client.\n"); 240 LOG (llevDebug, "Non supported extension text type for client.\n");
311 va_start (ap, new_format); 241 va_start (ap, new_format);
… …
320 250
321 va_start (ap, new_format); 251 va_start (ap, new_format);
322 vsnprintf (buf, HUGE_BUF, new_format, ap); 252 vsnprintf (buf, HUGE_BUF, new_format, ap);
323 va_end (ap); 253 va_end (ap);
324 strip_media_tag (buf); 254 strip_media_tag (buf);
325 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); 255 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
326 } 256 }
327} 257}
328 258
329/** 259/**
330 * Writes to everyone on the map *except* op. This is useful for emotions. 260 * Writes to everyone on the map *except* op. This is useful for emotions.
331 */ 261 */
332 262
333void 263void
334new_info_map_except (int color, maptile * map, object *op, const char *str) 264new_info_map_except (int color, maptile * map, object *op, const char *str)
335{ 265{
336 player *pl; 266 for_all_players (pl)
337
338 for (pl = first_player; pl != NULL; pl = pl->next)
339 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 267 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
340 {
341 new_draw_info (color, 0, pl->ob, str); 268 new_draw_info (color, 0, pl->ob, str);
342 }
343} 269}
344 270
345/** 271/**
346 * Writes to everyone on the map except op1 and op2 272 * Writes to everyone on the map except op1 and op2
347 */ 273 */
348 274
349void 275void
350new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 276new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
351{ 277{
352 player *pl; 278 for_all_players (pl)
353
354 for (pl = first_player; pl != NULL; pl = pl->next)
355 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 279 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
356 {
357 new_draw_info (color, 0, pl->ob, str); 280 new_draw_info (color, 0, pl->ob, str);
358 }
359} 281}
360 282
361/** 283/**
362 * Writes to everyone on the specified map 284 * Writes to everyone on the specified map
363 */ 285 */
364 286
365void 287void
366new_info_map (int color, maptile * map, const char *str) 288new_info_map (int color, maptile * map, const char *str)
367{ 289{
368 player *pl; 290 for_all_players (pl)
369
370 for (pl = first_player; pl != NULL; pl = pl->next)
371 if (pl->ob != NULL && pl->ob->map == map) 291 if (pl->ob != NULL && pl->ob->map == map)
372 {
373 new_draw_info (color, 0, pl->ob, str); 292 new_draw_info (color, 0, pl->ob, str);
374 }
375} 293}
376
377 294
378/** 295/**
379 * This does nothing now. However, in theory, we should probably send 296 * This does nothing now. However, in theory, we should probably send
380 * something to the client and let the client figure out how it might want 297 * something to the client and let the client figure out how it might want
381 * to handle this 298 * to handle this
… …
435 352
436 /* range_scroll is only used for controlling golems. If the 353 /* range_scroll is only used for controlling golems. If the
437 * the player does not have a golem, reset some things. 354 * the player does not have a golem, reset some things.
438 */ 355 */
439 case range_golem: 356 case range_golem:
440 if (pl->contr->ranges[range_golem] != NULL) 357 if (object *golem = pl->contr->ranges[range_golem])
441 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); 358 sprintf (obuf, "Range: golem (%s)", &golem->name);
442 else 359 else
443 { 360 {
444 pl->contr->shoottype = range_none; 361 pl->contr->shoottype = range_none;
445 strcpy (obuf, "Range: nothing"); 362 strcpy (obuf, "Range: nothing");
446 } 363 }
… …
470 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); 387 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
471 else 388 else
472 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 389 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
473} 390}
474 391
392// formerly a macro, used only by magic map, so optimised it out
393static inline faceidx
394GET_MAP_FACE (maptile *m, int x, int y, int layer)
395{
396 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))
397 return op->face;
398 else
399 return 0;
400}
475 401
476/** 402/**
477 * Helper for magic map creation. 403 * Helper for magic map creation.
478 * 404 *
479 * Takes a player, the map_mark array and an x and y starting position. 405 * Takes a player, the map_mark array and an x and y starting position.
… …
488magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 414magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
489{ 415{
490 int x, y, dx, dy, mflags; 416 int x, y, dx, dy, mflags;
491 sint16 nx, ny; 417 sint16 nx, ny;
492 maptile *mp; 418 maptile *mp;
493 New_Face *f;
494 419
495 for (dx = -1; dx <= 1; dx++) 420 for (dx = -1; dx <= 1; dx++)
496 { 421 {
497 for (dy = -1; dy <= 1; dy++) 422 for (dy = -1; dy <= 1; dy++)
498 { 423 {
… …
510 if (mflags & P_OUT_OF_MAP) 435 if (mflags & P_OUT_OF_MAP)
511 continue; 436 continue;
512 437
513 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 438 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
514 { 439 {
515 f = GET_MAP_FACE (mp, nx, ny, 0); 440 int f = GET_MAP_FACE (mp, nx, ny, 0);
516 if (f == blank_face) 441 if (f == blank_face)
442 {
517 f = GET_MAP_FACE (mp, nx, ny, 1); 443 f = GET_MAP_FACE (mp, nx, ny, 1);
518 if (f == blank_face) 444 if (f == blank_face)
519 f = GET_MAP_FACE (mp, nx, ny, 2); 445 f = GET_MAP_FACE (mp, nx, ny, 2);
446 }
447
448 int magicmap = faces [f].magicmap;
520 449
521 /* Should probably have P_NO_MAGIC here also, but then shops don't 450 /* Should probably have P_NO_MAGIC here also, but then shops don't
522 * work. 451 * work.
523 */ 452 */
524 if (mflags & P_BLOCKSVIEW) 453 if (mflags & P_BLOCKSVIEW)
525 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 454 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
526 else 455 else
527 { 456 {
528 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 457 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
529 magic_mapping_mark_recursive (pl, map_mark, x, y); 458 magic_mapping_mark_recursive (pl, map_mark, x, y);
530 } 459 }
531 } 460 }
532 } 461 }
533 } 462 }
534} 463}
535 464
536
537/** 465/**
538 * Creates magic map for player. 466 * Creates magic map for player.
539 * 467 *
540 * Note: For improved magic mapping display, the space that blocks 468 * Note: For improved magic mapping display, the space that blocks
541 * the view is now marked with value 2. Any dependencies of map_mark 469 * the view is now marked with value 2. Any dependencies of map_mark
542 * being nonzero have been changed to check for 1. Also, since 470 * being nonzero have been changed to check for 1. Also, since
543 * map_mark is a char value, putting 2 in should cause no problems. 471 * map_mark is a char value, putting 2 in should cause no problems.
544 * 472 *
545 * This function examines the map the player is on, and determines what 473 * This function examines the map the player is on, and determines what
546 * is visible. 2 is set for walls or objects that blocks view. 1 474 * is visible. 2 is set for walls or objects that blocks view. 1
547 * is for open spaces. map_mark should already have been initialized 475 * is for open spaces. map_mark should already have been initialised
548 * to zero before this is called. 476 * to zero before this is called.
549 * strength is an initial strength*2 rectangular area that we automatically 477 * strength is an initial strength*2 rectangular area that we automatically
550 * see in/penetrate through. 478 * see in/penetrate through.
551 */ 479 */
552
553void 480void
554magic_mapping_mark (object *pl, char *map_mark, int strength) 481magic_mapping_mark (object *pl, char *map_mark, int strength)
555{ 482{
556 int x, y, mflags; 483 int x, y, mflags;
557 sint16 nx, ny; 484 sint16 nx, ny;
558 maptile *mp; 485 maptile *mp;
559 New_Face *f;
560 486
561 for (x = -strength; x < strength; x++) 487 for (x = -strength; x < strength; x++)
562 { 488 {
563 for (y = -strength; y < strength; y++) 489 for (y = -strength; y < strength; y++)
564 { 490 {
565 mp = pl->map; 491 mp = pl->map;
566 nx = pl->x + x; 492 nx = pl->x + x;
567 ny = pl->y + y; 493 ny = pl->y + y;
494
568 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 495 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
569 if (mflags & P_OUT_OF_MAP) 496 if (mflags & P_OUT_OF_MAP)
570 continue; 497 continue;
571 else 498
499 int f = GET_MAP_FACE (mp, nx, ny, 0);
500 if (f == blank_face)
572 { 501 {
573 f = GET_MAP_FACE (mp, nx, ny, 0);
574 if (f == blank_face)
575 f = GET_MAP_FACE (mp, nx, ny, 1); 502 f = GET_MAP_FACE (mp, nx, ny, 1);
576 if (f == blank_face) 503 if (f == blank_face)
577 f = GET_MAP_FACE (mp, nx, ny, 2); 504 f = GET_MAP_FACE (mp, nx, ny, 2);
578 } 505 }
579 506
507 int magicmap = faces [f].magicmap;
508
580 if (mflags & P_BLOCKSVIEW) 509 if (mflags & P_BLOCKSVIEW)
581 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 510 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
582 else 511 else
583 { 512 {
584 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 513 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
585 magic_mapping_mark_recursive (pl, map_mark, x, y); 514 magic_mapping_mark_recursive (pl, map_mark, x, y);
586 } 515 }
587 } 516 }
588 } 517 }
589} 518}
590 519
591
592/** 520/**
593 * Creates and sends magic map to player. 521 * Creates and sends magic map to player.
594 * 522 *
595 * The following function is a lot messier than it really should be, 523 * The following function is a lot messier than it really should be,
596 * but there is no real easy solution. 524 * but there is no real easy solution.
597 * 525 *
598 * Mark Wedel 526 * Mark Wedel
599 */ 527 */
600
601void 528void
602draw_magic_map (object *pl) 529draw_magic_map (object *pl)
603{ 530{
604 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 531 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
605 int xmin, xmax, ymin, ymax; 532 int xmin, xmax, ymin, ymax;
… …
623 xmax = 0; 550 xmax = 0;
624 ymax = 0; 551 ymax = 0;
625 552
626 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 553 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
627 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 554 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
628 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 555 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
629 { 556 {
630 xmin = x < xmin ? x : xmin; 557 xmin = x < xmin ? x : xmin;
631 xmax = x > xmax ? x : xmax; 558 xmax = x > xmax ? x : xmax;
632 ymin = y < ymin ? y : ymin; 559 ymin = y < ymin ? y : ymin;
633 ymax = y > ymax ? y : ymax; 560 ymax = y > ymax ? y : ymax;
634 } 561 }
635 562
636 SockList sl (MAXSOCKBUF); 563 packet sl;
637 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 564 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
638 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 565 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
639 566
640 for (int y = ymin; y <= ymax; y++) 567 for (int y = ymin; y <= ymax; y++)
641 for (int x = xmin; x <= xmax; x++) 568 for (int x = xmin; x <= xmax; x++)
642 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); 569 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
643 570
644 Send_With_Handling (&pl->contr->socket, &sl); 571 pl->contr->ns->send_packet (sl);
645
646 sl.free ();
647 572
648 free (map_mark); 573 free (map_mark);
649} 574}
650 575
651
652/** 576/**
653 * Send a kill log record to sockets 577 * Send a kill log record to sockets
654 */ 578 */
655
656void 579void
657Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) 580Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
658{ 581{
659 size_t len; 582 size_t len;
660 char buf[MAX_BUF]; 583 char buf[MAX_BUF];
… …
664 else 587 else
665 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); 588 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
666 589
667 len = strlen (buf); 590 len = strlen (buf);
668} 591}
592

Diff Legend

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