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.21 by root, Sat Dec 16 03:08:26 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 (client * ns, int color, const char *str) 48esrv_print_msg (client *ns, int color, const char *str)
49{ 49{
50 ns->send_packet_printf ("drawinfo %d %s", color, str); 50 ns->send_packet_printf ("drawinfo %d %s", color, str);
51} 51}
52 52
53/** 53/**
… …
58 * subtype type and subtype of text message 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 59 * intro Intro message to send with main message if client does not support the message type
60 * message The main message 60 * message The main message
61 */ 61 */
62static void 62static void
63esrv_print_ext_msg (client * 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)
64{ 64{
65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
66} 66}
67 67
68/** 68/**
… …
73 * 73 *
74 * 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.
75 * 75 *
76 * Else sends message to player via esrv_print_msg 76 * Else sends message to player via esrv_print_msg
77 */ 77 */
78
79static void 78static void
80print_message (int colr, const object *pl, const char *tmp) 79print_message (int colr, const object *pl, const char *tmp)
81{ 80{
82
83 if (!tmp) 81 if (!tmp)
84 tmp = "[NULL]"; 82 tmp = "[NULL]";
85 83
86 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
87 return; 85 return;
88 86
89 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
90 esrv_print_msg (pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
91} 89}
92 90
93/** 91bool
94 * Prints out the contents of specified buffer structures, 92client::msg_suppressed (const char *msg)
95 * and clears the string.
96 */
97
98void
99flush_output_element (const object *pl, Output_Buf * outputs)
100{ 93{
101 char tbuf[MAX_BUF]; 94 if (!pl)
102
103 if (outputs->buf == NULL)
104 return; 95 return false;
105 if (outputs->count > 1) 96
106 { 97 if (pl->outputs_count <= 1 || !pl->outputs_sync)
107 snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf); 98 return false;
108 print_message (NDI_BLACK, pl, tbuf); 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)
109 } 107 {
110 else 108 if (len == buf->len && !memcmp (msg, buf->msg, len))
111 print_message (NDI_BLACK, pl, &outputs->buf);
112
113 outputs->buf = NULL;
114 outputs->first_update = 0; /* This way, it will be reused */
115}
116
117/**
118 * Sends message to player through output buffers.
119 * \param pl player to send message
120 * \param buf message to send
121 *
122 * If player's output_count is 1, sends message directly.
123 *
124 * Else checks output buffers for specified message.
125 *
126 * If found, checks if message should be sent now.
127 *
128 * If message not already in buffers, flushes olders buffer,
129 * and adds message to queue.
130 */
131
132static void
133check_output_buffers (const object *pl, const char *buf)
134{
135 int i, oldest = 0;
136
137 if (pl->contr->outputs_count < 2)
138 {
139 print_message (NDI_BLACK, pl, buf);
140 return;
141 }
142 else
143 {
144 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
145 { 109 {
146 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)
147 break; 112 {
148 else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) 113 // yes, take over matching buffer, print
149 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;
150 } 123 }
151 /* We found a match */
152 if (i < NUM_OUTPUT_BUFS)
153 {
154 pl->contr->outputs[i].count++;
155 if (pl->contr->outputs[i].count >= pl->contr->outputs_count)
156 {
157 flush_output_element (pl, &pl->contr->outputs[i]);
158 }
159 }
160 /* No match - flush the oldest, and put the new one in */
161 else
162 {
163 flush_output_element (pl, &pl->contr->outputs[oldest]);
164 124
165 pl->contr->outputs[oldest].first_update = pticks; 125 if (lru->expire > buf->expire)
166 pl->contr->outputs[oldest].count = 1; 126 lru = buf;
167 pl->contr->outputs[oldest].buf = buf;
168 }
169 } 127 }
170}
171 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);
172 134
135 return false;
136}
173 137
174/** 138/**
175 * Sends message to player(s). 139 * Sends message to player(s).
176 * 140 *
177 * flags is various flags - mostly color, plus a few specials. 141 * flags is various flags - mostly color, plus a few specials.
… …
185 * in the flags. 149 * in the flags.
186 * 150 *
187 * 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.
188 * 152 *
189 */ 153 */
190
191void 154void
192new_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)
193{ 156{
194
195 if (flags & NDI_ALL) 157 if (flags & NDI_ALL)
196 { 158 {
197 player *tmppl; 159 for_all_players (pl)
198
199 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
200 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 160 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
201 161
202 return; 162 return;
203 } 163 }
204 164
205 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 165 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
206 {
207 /* Write to the socket? */
208 print_message (0, NULL, buf);
209 return;
210 }
211
212 if (pl->type != PLAYER)
213 return; 166 return;
214 167
215 if (pri >= pl->contr->listening) 168 if (pri >= pl->contr->listening)
216 return; 169 return;
217 170
218 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 171 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
219 /* following prints stuff out, as appropriate */ 172 || !pl->contr->ns->msg_suppressed (buf))
220 check_output_buffers (pl, buf);
221 else
222 print_message (flags & NDI_COLOR_MASK, pl, buf); 173 print_message (flags & NDI_COLOR_MASK, pl, buf);
223} 174}
224 175
225/** 176/**
226 * Wrapper for new_draw_info printf-like. 177 * Wrapper for new_draw_info printf-like.
… …
228 * 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
229 * 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
230 * 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
231 * client/server bandwidth (client could keep track of various strings 182 * client/server bandwidth (client could keep track of various strings
232 */ 183 */
233
234void 184void
235new_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, ...)
236{ 186{
237 char buf[HUGE_BUF]; 187 char buf[HUGE_BUF];
238 188
239 va_list ap; 189 va_list ap;
240
241 va_start (ap, format); 190 va_start (ap, format);
242
243 vsnprintf (buf, HUGE_BUF, format, ap); 191 vsnprintf (buf, HUGE_BUF, format, ap);
244
245 va_end (ap); 192 va_end (ap);
246 193
247 new_draw_info (flags, pri, pl, buf); 194 new_draw_info (flags, pri, pl, buf);
248} 195}
249 196
250
251void 197void
252draw_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)
253{ 199{
254 200
255 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 201 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
256 return; 202 return;
257 203
258 if (pri >= pl->contr->listening) 204 if (pri >= pl->contr->listening)
259 return; 205 return;
260 206
261 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) 207 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
262 { 208 {
263 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 209 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
264 210
265 if (buf == NULL) 211 if (buf == NULL)
266 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 212 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
271 new_draw_info (flags, pri, pl, buf); 217 new_draw_info (flags, pri, pl, buf);
272 free (buf); 218 free (buf);
273 } 219 }
274 } 220 }
275 else 221 else
276 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);
277} 223}
278 224
279void 225void
280draw_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, ...)
281{ 227{
282
283 char buf[HUGE_BUF]; 228 char buf[HUGE_BUF];
284 229
285 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 230 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
286 return; 231 return;
287 232
288 if (pri >= pl->contr->listening) 233 if (pri >= pl->contr->listening)
289 return; 234 return;
290 235
291 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) 236 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
292 { 237 {
293 va_list ap; 238 va_list ap;
294 239
295 LOG (llevDebug, "Non supported extension text type for client.\n"); 240 LOG (llevDebug, "Non supported extension text type for client.\n");
296 va_start (ap, new_format); 241 va_start (ap, new_format);
… …
305 250
306 va_start (ap, new_format); 251 va_start (ap, new_format);
307 vsnprintf (buf, HUGE_BUF, new_format, ap); 252 vsnprintf (buf, HUGE_BUF, new_format, ap);
308 va_end (ap); 253 va_end (ap);
309 strip_media_tag (buf); 254 strip_media_tag (buf);
310 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);
311 } 256 }
312} 257}
313 258
314/** 259/**
315 * 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.
316 */ 261 */
317 262
318void 263void
319new_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)
320{ 265{
321 player *pl; 266 for_all_players (pl)
322
323 for (pl = first_player; pl != NULL; pl = pl->next)
324 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 267 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
325 {
326 new_draw_info (color, 0, pl->ob, str); 268 new_draw_info (color, 0, pl->ob, str);
327 }
328} 269}
329 270
330/** 271/**
331 * Writes to everyone on the map except op1 and op2 272 * Writes to everyone on the map except op1 and op2
332 */ 273 */
333 274
334void 275void
335new_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)
336{ 277{
337 player *pl; 278 for_all_players (pl)
338
339 for (pl = first_player; pl != NULL; pl = pl->next)
340 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)
341 {
342 new_draw_info (color, 0, pl->ob, str); 280 new_draw_info (color, 0, pl->ob, str);
343 }
344} 281}
345 282
346/** 283/**
347 * Writes to everyone on the specified map 284 * Writes to everyone on the specified map
348 */ 285 */
349 286
350void 287void
351new_info_map (int color, maptile * map, const char *str) 288new_info_map (int color, maptile * map, const char *str)
352{ 289{
353 player *pl; 290 for_all_players (pl)
354
355 for (pl = first_player; pl != NULL; pl = pl->next)
356 if (pl->ob != NULL && pl->ob->map == map) 291 if (pl->ob != NULL && pl->ob->map == map)
357 {
358 new_draw_info (color, 0, pl->ob, str); 292 new_draw_info (color, 0, pl->ob, str);
359 }
360} 293}
361
362 294
363/** 295/**
364 * This does nothing now. However, in theory, we should probably send 296 * This does nothing now. However, in theory, we should probably send
365 * 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
366 * to handle this 298 * to handle this
… …
420 352
421 /* range_scroll is only used for controlling golems. If the 353 /* range_scroll is only used for controlling golems. If the
422 * the player does not have a golem, reset some things. 354 * the player does not have a golem, reset some things.
423 */ 355 */
424 case range_golem: 356 case range_golem:
425 if (pl->contr->ranges[range_golem] != NULL) 357 if (object *golem = pl->contr->ranges[range_golem])
426 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); 358 sprintf (obuf, "Range: golem (%s)", &golem->name);
427 else 359 else
428 { 360 {
429 pl->contr->shoottype = range_none; 361 pl->contr->shoottype = range_none;
430 strcpy (obuf, "Range: nothing"); 362 strcpy (obuf, "Range: nothing");
431 } 363 }
… …
455 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);
456 else 388 else
457 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);
458} 390}
459 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}
460 401
461/** 402/**
462 * Helper for magic map creation. 403 * Helper for magic map creation.
463 * 404 *
464 * 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.
… …
473magic_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)
474{ 415{
475 int x, y, dx, dy, mflags; 416 int x, y, dx, dy, mflags;
476 sint16 nx, ny; 417 sint16 nx, ny;
477 maptile *mp; 418 maptile *mp;
478 New_Face *f;
479 419
480 for (dx = -1; dx <= 1; dx++) 420 for (dx = -1; dx <= 1; dx++)
481 { 421 {
482 for (dy = -1; dy <= 1; dy++) 422 for (dy = -1; dy <= 1; dy++)
483 { 423 {
… …
495 if (mflags & P_OUT_OF_MAP) 435 if (mflags & P_OUT_OF_MAP)
496 continue; 436 continue;
497 437
498 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)
499 { 439 {
500 f = GET_MAP_FACE (mp, nx, ny, 0); 440 int f = GET_MAP_FACE (mp, nx, ny, 0);
501 if (f == blank_face) 441 if (f == blank_face)
442 {
502 f = GET_MAP_FACE (mp, nx, ny, 1); 443 f = GET_MAP_FACE (mp, nx, ny, 1);
503 if (f == blank_face) 444 if (f == blank_face)
504 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;
505 449
506 /* 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
507 * work. 451 * work.
508 */ 452 */
509 if (mflags & P_BLOCKSVIEW) 453 if (mflags & P_BLOCKSVIEW)
510 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;
511 else 455 else
512 { 456 {
513 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;
514 magic_mapping_mark_recursive (pl, map_mark, x, y); 458 magic_mapping_mark_recursive (pl, map_mark, x, y);
515 } 459 }
516 } 460 }
517 } 461 }
518 } 462 }
519} 463}
520 464
521
522/** 465/**
523 * Creates magic map for player. 466 * Creates magic map for player.
524 * 467 *
525 * Note: For improved magic mapping display, the space that blocks 468 * Note: For improved magic mapping display, the space that blocks
526 * 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
527 * being nonzero have been changed to check for 1. Also, since 470 * being nonzero have been changed to check for 1. Also, since
528 * 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.
529 * 472 *
530 * 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
531 * 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
532 * is for open spaces. map_mark should already have been initialized 475 * is for open spaces. map_mark should already have been initialised
533 * to zero before this is called. 476 * to zero before this is called.
534 * strength is an initial strength*2 rectangular area that we automatically 477 * strength is an initial strength*2 rectangular area that we automatically
535 * see in/penetrate through. 478 * see in/penetrate through.
536 */ 479 */
537
538void 480void
539magic_mapping_mark (object *pl, char *map_mark, int strength) 481magic_mapping_mark (object *pl, char *map_mark, int strength)
540{ 482{
541 int x, y, mflags; 483 int x, y, mflags;
542 sint16 nx, ny; 484 sint16 nx, ny;
543 maptile *mp; 485 maptile *mp;
544 New_Face *f;
545 486
546 for (x = -strength; x < strength; x++) 487 for (x = -strength; x < strength; x++)
547 { 488 {
548 for (y = -strength; y < strength; y++) 489 for (y = -strength; y < strength; y++)
549 { 490 {
550 mp = pl->map; 491 mp = pl->map;
551 nx = pl->x + x; 492 nx = pl->x + x;
552 ny = pl->y + y; 493 ny = pl->y + y;
494
553 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 495 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
554 if (mflags & P_OUT_OF_MAP) 496 if (mflags & P_OUT_OF_MAP)
555 continue; 497 continue;
556 else 498
499 int f = GET_MAP_FACE (mp, nx, ny, 0);
500 if (f == blank_face)
557 { 501 {
558 f = GET_MAP_FACE (mp, nx, ny, 0);
559 if (f == blank_face)
560 f = GET_MAP_FACE (mp, nx, ny, 1); 502 f = GET_MAP_FACE (mp, nx, ny, 1);
561 if (f == blank_face) 503 if (f == blank_face)
562 f = GET_MAP_FACE (mp, nx, ny, 2); 504 f = GET_MAP_FACE (mp, nx, ny, 2);
563 } 505 }
564 506
507 int magicmap = faces [f].magicmap;
508
565 if (mflags & P_BLOCKSVIEW) 509 if (mflags & P_BLOCKSVIEW)
566 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;
567 else 511 else
568 { 512 {
569 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;
570 magic_mapping_mark_recursive (pl, map_mark, x, y); 514 magic_mapping_mark_recursive (pl, map_mark, x, y);
571 } 515 }
572 } 516 }
573 } 517 }
574} 518}
575 519
576
577/** 520/**
578 * Creates and sends magic map to player. 521 * Creates and sends magic map to player.
579 * 522 *
580 * 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,
581 * but there is no real easy solution. 524 * but there is no real easy solution.
582 * 525 *
583 * Mark Wedel 526 * Mark Wedel
584 */ 527 */
585
586void 528void
587draw_magic_map (object *pl) 529draw_magic_map (object *pl)
588{ 530{
589 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);
590 int xmin, xmax, ymin, ymax; 532 int xmin, xmax, ymin, ymax;
… …
608 xmax = 0; 550 xmax = 0;
609 ymax = 0; 551 ymax = 0;
610 552
611 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 553 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
612 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 554 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
613 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 555 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
614 { 556 {
615 xmin = x < xmin ? x : xmin; 557 xmin = x < xmin ? x : xmin;
616 xmax = x > xmax ? x : xmax; 558 xmax = x > xmax ? x : xmax;
617 ymin = y < ymin ? y : ymin; 559 ymin = y < ymin ? y : ymin;
618 ymax = y > ymax ? y : ymax; 560 ymax = y > ymax ? y : ymax;
… …
624 566
625 for (int y = ymin; y <= ymax; y++) 567 for (int y = ymin; y <= ymax; y++)
626 for (int x = xmin; x <= xmax; x++) 568 for (int x = xmin; x <= xmax; x++)
627 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); 569 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
628 570
629 pl->contr->socket->send_packet (sl); 571 pl->contr->ns->send_packet (sl);
630 572
631 free (map_mark); 573 free (map_mark);
632} 574}
633 575
634
635/** 576/**
636 * Send a kill log record to sockets 577 * Send a kill log record to sockets
637 */ 578 */
638
639void 579void
640Log_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)
641{ 581{
642 size_t len; 582 size_t len;
643 char buf[MAX_BUF]; 583 char buf[MAX_BUF];
… …
647 else 587 else
648 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);
649 589
650 len = strlen (buf); 590 len = strlen (buf);
651} 591}
592

Diff Legend

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