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.10 by root, Tue Sep 19 10:21:58 2006 UTC vs.
Revision 1.37 by root, Tue Apr 24 12:32:16 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 char buf[HUGE_BUF]; 50 ns->send_packet_printf ("drawinfo %d %s", color, str);
51
52 if (ns->status == Ns_Old)
53 {
54 snprintf (buf, HUGE_BUF, "%s\n", str);
55 }
56 else
57 {
58 snprintf (buf, HUGE_BUF, "drawinfo %d %s", color, str);
59 }
60
61/* LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/
62 Write_String_To_Socket (ns, buf, strlen (buf));
63} 51}
64 52
65/** 53/**
66 * Draws an extended message on the client. 54 * Draws an extended message on the client.
67 * ns the socket to send message to 55 * ns the socket to send message to
… …
70 * subtype type and subtype of text message 58 * subtype type and subtype of text message
71 * 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
72 * message The main message 60 * message The main message
73 */ 61 */
74static void 62static void
75esrv_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)
76{ 64{
77 char buf[HUGE_BUF];
78
79 snprintf (buf, HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
80 Write_String_To_Socket (ns, buf, strlen (buf));
81
82/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
83
84} 66}
85 67
86/** 68/**
87 * Frontend for esrv_print_msg 69 * Frontend for esrv_print_msg
88 * \param colr message color 70 * \param colr message color
… …
91 * 73 *
92 * 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.
93 * 75 *
94 * Else sends message to player via esrv_print_msg 76 * Else sends message to player via esrv_print_msg
95 */ 77 */
96
97static void 78static void
98print_message (int colr, const object *pl, const char *tmp) 79print_message (int colr, const object *pl, const char *tmp)
99{ 80{
100 81 if (!tmp)
101 if (tmp == (char *) NULL)
102 {
103 tmp = "[NULL]"; 82 tmp = "[NULL]";
104 }
105 83
106 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
107 return; 85 return;
108 86
109 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
110 {
111 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
112 return;
113 }
114} 89}
115
116 90
117/** 91/**
118 * Prints out the contents of specified buffer structures, 92 * Prints out the contents of specified buffer structures,
119 * and clears the string. 93 * and clears the string.
120 */ 94 */
121
122void 95void
123flush_output_element (const object *pl, Output_Buf * outputs) 96flush_output_element (const object *pl, Output_Buf * outputs)
124{ 97{
125 char tbuf[MAX_BUF]; 98 char tbuf[MAX_BUF];
126 99
… …
150 * If found, checks if message should be sent now. 123 * If found, checks if message should be sent now.
151 * 124 *
152 * If message not already in buffers, flushes olders buffer, 125 * If message not already in buffers, flushes olders buffer,
153 * and adds message to queue. 126 * and adds message to queue.
154 */ 127 */
155
156static void 128static void
157check_output_buffers (const object *pl, const char *buf) 129check_output_buffers (const object *pl, const char *buf)
158{ 130{
159 int i, oldest = 0; 131 int i, oldest = 0;
160 132
… …
191 pl->contr->outputs[oldest].buf = buf; 163 pl->contr->outputs[oldest].buf = buf;
192 } 164 }
193 } 165 }
194} 166}
195 167
196
197
198/** 168/**
199 * Sends message to player(s). 169 * Sends message to player(s).
200 * 170 *
201 * flags is various flags - mostly color, plus a few specials. 171 * flags is various flags - mostly color, plus a few specials.
202 * 172 *
… …
213 */ 183 */
214 184
215void 185void
216new_draw_info (int flags, int pri, const object *pl, const char *buf) 186new_draw_info (int flags, int pri, const object *pl, const char *buf)
217{ 187{
218
219 if (flags & NDI_ALL) 188 if (flags & NDI_ALL)
220 { 189 {
221 player *tmppl; 190 for_all_players (pl)
222 int i;
223
224 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
225 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 191 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
226
227 for (i = 1; i < socket_info.allocated_sockets; i++)
228 {
229 if (init_sockets[i].status == Ns_Old && init_sockets[i].old_mode != Old_Listen && pri < 10)
230 {
231 cs_write_string (&init_sockets[i], buf, strlen (buf));
232 /* Most messages don't have a newline, so add one */
233 cs_write_string (&init_sockets[i], "\n", 1);
234 }
235 }
236 192
237 return; 193 return;
238 } 194 }
239 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 195
240 { 196 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
241 /* Write to the socket? */
242 print_message (0, NULL, buf);
243 return; 197 return;
244 } 198
245 if (pl->type != PLAYER)
246 return;
247 if (pri >= pl->contr->listening) 199 if (pri >= pl->contr->listening)
248 return; 200 return;
249 201
250 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 202 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
251 {
252 /* following prints stuff out, as appropriate */
253 check_output_buffers (pl, buf); 203 check_output_buffers (pl, buf);
254 }
255 else 204 else
256 {
257 print_message (flags & NDI_COLOR_MASK, pl, buf); 205 print_message (flags & NDI_COLOR_MASK, pl, buf);
258 }
259} 206}
260 207
261/** 208/**
262 * Wrapper for new_draw_info printf-like. 209 * Wrapper for new_draw_info printf-like.
263 * 210 *
264 * This is a pretty trivial function, but it allows us to use printf style 211 * This is a pretty trivial function, but it allows us to use printf style
265 * formatting, so instead of the calling function having to do it, we do 212 * formatting, so instead of the calling function having to do it, we do
266 * it here. It may also have advantages in the future for reduction of 213 * it here. It may also have advantages in the future for reduction of
267 * client/server bandwidth (client could keep track of various strings 214 * client/server bandwidth (client could keep track of various strings
268 */ 215 */
269
270void 216void
271new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 217new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
272{ 218{
273 char buf[HUGE_BUF]; 219 char buf[HUGE_BUF];
274 220
275 va_list ap; 221 va_list ap;
276
277 va_start (ap, format); 222 va_start (ap, format);
278
279 vsnprintf (buf, HUGE_BUF, format, ap); 223 vsnprintf (buf, HUGE_BUF, format, ap);
280
281 va_end (ap); 224 va_end (ap);
282 225
283 new_draw_info (flags, pri, pl, buf); 226 new_draw_info (flags, pri, pl, buf);
284} 227}
285 228
286
287void 229void
288draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) 230draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
289{ 231{
290 232
291 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 233 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
292 return; 234 return;
293 235
294 if (pri >= pl->contr->listening) 236 if (pri >= pl->contr->listening)
295 return; 237 return;
238
296 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 239 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
297 { 240 {
298 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 241 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
299 242
300 if (buf == NULL) 243 if (buf == NULL)
301 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 244 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
306 new_draw_info (flags, pri, pl, buf); 249 new_draw_info (flags, pri, pl, buf);
307 free (buf); 250 free (buf);
308 } 251 }
309 } 252 }
310 else 253 else
311 {
312 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message); 254 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
313 }
314} 255}
315 256
316void 257void
317draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 258draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
318{ 259{
319
320 char buf[HUGE_BUF]; 260 char buf[HUGE_BUF];
321 261
322 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 262 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
323 return; 263 return;
324 264
325 if (pri >= pl->contr->listening) 265 if (pri >= pl->contr->listening)
326 return; 266 return;
267
327 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 268 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
328 { 269 {
329 va_list ap; 270 va_list ap;
330 271
331 LOG (llevDebug, "Non supported extension text type for client.\n"); 272 LOG (llevDebug, "Non supported extension text type for client.\n");
332 va_start (ap, new_format); 273 va_start (ap, new_format);
… …
341 282
342 va_start (ap, new_format); 283 va_start (ap, new_format);
343 vsnprintf (buf, HUGE_BUF, new_format, ap); 284 vsnprintf (buf, HUGE_BUF, new_format, ap);
344 va_end (ap); 285 va_end (ap);
345 strip_media_tag (buf); 286 strip_media_tag (buf);
346 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); 287 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
347 } 288 }
348} 289}
349 290
350/** 291/**
351 * Writes to everyone on the map *except* op. This is useful for emotions. 292 * Writes to everyone on the map *except* op. This is useful for emotions.
352 */ 293 */
353 294
354void 295void
355new_info_map_except (int color, maptile * map, object *op, const char *str) 296new_info_map_except (int color, maptile * map, object *op, const char *str)
356{ 297{
357 player *pl; 298 for_all_players (pl)
358
359 for (pl = first_player; pl != NULL; pl = pl->next)
360 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 299 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
361 {
362 new_draw_info (color, 0, pl->ob, str); 300 new_draw_info (color, 0, pl->ob, str);
363 }
364} 301}
365 302
366/** 303/**
367 * Writes to everyone on the map except op1 and op2 304 * Writes to everyone on the map except op1 and op2
368 */ 305 */
369 306
370void 307void
371new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 308new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
372{ 309{
373 player *pl; 310 for_all_players (pl)
374
375 for (pl = first_player; pl != NULL; pl = pl->next)
376 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 311 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
377 {
378 new_draw_info (color, 0, pl->ob, str); 312 new_draw_info (color, 0, pl->ob, str);
379 }
380} 313}
381 314
382/** 315/**
383 * Writes to everyone on the specified map 316 * Writes to everyone on the specified map
384 */ 317 */
385 318
386void 319void
387new_info_map (int color, maptile * map, const char *str) 320new_info_map (int color, maptile * map, const char *str)
388{ 321{
389 player *pl; 322 for_all_players (pl)
390
391 for (pl = first_player; pl != NULL; pl = pl->next)
392 if (pl->ob != NULL && pl->ob->map == map) 323 if (pl->ob != NULL && pl->ob->map == map)
393 {
394 new_draw_info (color, 0, pl->ob, str); 324 new_draw_info (color, 0, pl->ob, str);
395 }
396} 325}
397
398 326
399/** 327/**
400 * This does nothing now. However, in theory, we should probably send 328 * This does nothing now. However, in theory, we should probably send
401 * something to the client and let the client figure out how it might want 329 * something to the client and let the client figure out how it might want
402 * to handle this 330 * to handle this
… …
456 384
457 /* range_scroll is only used for controlling golems. If the 385 /* range_scroll is only used for controlling golems. If the
458 * the player does not have a golem, reset some things. 386 * the player does not have a golem, reset some things.
459 */ 387 */
460 case range_golem: 388 case range_golem:
461 if (pl->contr->ranges[range_golem] != NULL) 389 if (object *golem = pl->contr->ranges[range_golem])
462 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); 390 sprintf (obuf, "Range: golem (%s)", &golem->name);
463 else 391 else
464 { 392 {
465 pl->contr->shoottype = range_none; 393 pl->contr->shoottype = range_none;
466 strcpy (obuf, "Range: nothing"); 394 strcpy (obuf, "Range: nothing");
467 } 395 }
… …
491 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); 419 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
492 else 420 else
493 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 421 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
494} 422}
495 423
424// formerly a macro, used only by magic map, so optimised it out
425static inline faceidx
426GET_MAP_FACE (maptile *m, int x, int y, int layer)
427{
428 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))
429 return op->face;
430 else
431 return 0;
432}
496 433
497/** 434/**
498 * Helper for magic map creation. 435 * Helper for magic map creation.
499 * 436 *
500 * Takes a player, the map_mark array and an x and y starting position. 437 * Takes a player, the map_mark array and an x and y starting position.
… …
509magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 446magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
510{ 447{
511 int x, y, dx, dy, mflags; 448 int x, y, dx, dy, mflags;
512 sint16 nx, ny; 449 sint16 nx, ny;
513 maptile *mp; 450 maptile *mp;
514 New_Face *f;
515 451
516 for (dx = -1; dx <= 1; dx++) 452 for (dx = -1; dx <= 1; dx++)
517 { 453 {
518 for (dy = -1; dy <= 1; dy++) 454 for (dy = -1; dy <= 1; dy++)
519 { 455 {
… …
531 if (mflags & P_OUT_OF_MAP) 467 if (mflags & P_OUT_OF_MAP)
532 continue; 468 continue;
533 469
534 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 470 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
535 { 471 {
536 f = GET_MAP_FACE (mp, nx, ny, 0); 472 int f = GET_MAP_FACE (mp, nx, ny, 0);
537 if (f == blank_face) 473 if (f == blank_face)
474 {
538 f = GET_MAP_FACE (mp, nx, ny, 1); 475 f = GET_MAP_FACE (mp, nx, ny, 1);
539 if (f == blank_face) 476 if (f == blank_face)
540 f = GET_MAP_FACE (mp, nx, ny, 2); 477 f = GET_MAP_FACE (mp, nx, ny, 2);
478 }
479
480 int magicmap = faces [f].magicmap;
541 481
542 /* Should probably have P_NO_MAGIC here also, but then shops don't 482 /* Should probably have P_NO_MAGIC here also, but then shops don't
543 * work. 483 * work.
544 */ 484 */
545 if (mflags & P_BLOCKSVIEW) 485 if (mflags & P_BLOCKSVIEW)
546 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 486 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
547 else 487 else
548 { 488 {
549 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 489 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
550 magic_mapping_mark_recursive (pl, map_mark, x, y); 490 magic_mapping_mark_recursive (pl, map_mark, x, y);
551 } 491 }
552 } 492 }
553 } 493 }
554 } 494 }
555} 495}
556
557 496
558/** 497/**
559 * Creates magic map for player. 498 * Creates magic map for player.
560 * 499 *
561 * Note: For improved magic mapping display, the space that blocks 500 * Note: For improved magic mapping display, the space that blocks
… …
563 * being nonzero have been changed to check for 1. Also, since 502 * being nonzero have been changed to check for 1. Also, since
564 * map_mark is a char value, putting 2 in should cause no problems. 503 * map_mark is a char value, putting 2 in should cause no problems.
565 * 504 *
566 * This function examines the map the player is on, and determines what 505 * This function examines the map the player is on, and determines what
567 * is visible. 2 is set for walls or objects that blocks view. 1 506 * is visible. 2 is set for walls or objects that blocks view. 1
568 * is for open spaces. map_mark should already have been initialized 507 * is for open spaces. map_mark should already have been initialised
569 * to zero before this is called. 508 * to zero before this is called.
570 * strength is an initial strength*2 rectangular area that we automatically 509 * strength is an initial strength*2 rectangular area that we automatically
571 * see in/penetrate through. 510 * see in/penetrate through.
572 */ 511 */
573
574void 512void
575magic_mapping_mark (object *pl, char *map_mark, int strength) 513magic_mapping_mark (object *pl, char *map_mark, int strength)
576{ 514{
577 int x, y, mflags; 515 int x, y, mflags;
578 sint16 nx, ny; 516 sint16 nx, ny;
579 maptile *mp; 517 maptile *mp;
580 New_Face *f;
581 518
582 for (x = -strength; x < strength; x++) 519 for (x = -strength; x < strength; x++)
583 { 520 {
584 for (y = -strength; y < strength; y++) 521 for (y = -strength; y < strength; y++)
585 { 522 {
586 mp = pl->map; 523 mp = pl->map;
587 nx = pl->x + x; 524 nx = pl->x + x;
588 ny = pl->y + y; 525 ny = pl->y + y;
526
589 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 527 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
590 if (mflags & P_OUT_OF_MAP) 528 if (mflags & P_OUT_OF_MAP)
591 continue; 529 continue;
592 else 530
531 int f = GET_MAP_FACE (mp, nx, ny, 0);
532 if (f == blank_face)
593 { 533 {
594 f = GET_MAP_FACE (mp, nx, ny, 0);
595 if (f == blank_face)
596 f = GET_MAP_FACE (mp, nx, ny, 1); 534 f = GET_MAP_FACE (mp, nx, ny, 1);
597 if (f == blank_face) 535 if (f == blank_face)
598 f = GET_MAP_FACE (mp, nx, ny, 2); 536 f = GET_MAP_FACE (mp, nx, ny, 2);
599 } 537 }
600 538
539 int magicmap = faces [f].magicmap;
540
601 if (mflags & P_BLOCKSVIEW) 541 if (mflags & P_BLOCKSVIEW)
602 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 542 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
603 else 543 else
604 { 544 {
605 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 545 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
606 magic_mapping_mark_recursive (pl, map_mark, x, y); 546 magic_mapping_mark_recursive (pl, map_mark, x, y);
607 } 547 }
608 } 548 }
609 } 549 }
610} 550}
611 551
612
613/** 552/**
614 * Creates and sends magic map to player. 553 * Creates and sends magic map to player.
615 * 554 *
616 * The following function is a lot messier than it really should be, 555 * The following function is a lot messier than it really should be,
617 * but there is no real easy solution. 556 * but there is no real easy solution.
618 * 557 *
619 * Mark Wedel 558 * Mark Wedel
620 */ 559 */
621
622void 560void
623draw_magic_map (object *pl) 561draw_magic_map (object *pl)
624{ 562{
625 int x, y;
626 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 563 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
627 int xmin, xmax, ymin, ymax; 564 int xmin, xmax, ymin, ymax;
628 SockList sl;
629 565
630 if (pl->type != PLAYER) 566 if (pl->type != PLAYER)
631 { 567 {
632 LOG (llevError, "Non player object called draw_map.\n"); 568 LOG (llevError, "Non player object called draw_map.\n");
633 return; 569 return;
… …
643 */ 579 */
644 xmin = MAGIC_MAP_SIZE; 580 xmin = MAGIC_MAP_SIZE;
645 ymin = MAGIC_MAP_SIZE; 581 ymin = MAGIC_MAP_SIZE;
646 xmax = 0; 582 xmax = 0;
647 ymax = 0; 583 ymax = 0;
584
648 for (x = 0; x < MAGIC_MAP_SIZE; x++) 585 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
649 {
650 for (y = 0; y < MAGIC_MAP_SIZE; y++) 586 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
651 {
652 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 587 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
653 { 588 {
654 xmin = x < xmin ? x : xmin; 589 xmin = x < xmin ? x : xmin;
655 xmax = x > xmax ? x : xmax; 590 xmax = x > xmax ? x : xmax;
656 ymin = y < ymin ? y : ymin; 591 ymin = y < ymin ? y : ymin;
657 ymax = y > ymax ? y : ymax; 592 ymax = y > ymax ? y : ymax;
658 } 593 }
659 }
660 }
661 594
662 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 595 packet sl;
663 snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 596 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
664 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 597 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
665 sl.len = strlen ((char *) sl.buf);
666 598
667 for (y = ymin; y <= ymax; y++) 599 for (int y = ymin; y <= ymax; y++)
668 {
669 for (x = xmin; x <= xmax; x++) 600 for (int x = xmin; x <= xmax; x++)
670 {
671 sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; 601 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
672 } /* x loop */
673 } /* y loop */
674 602
675 Send_With_Handling (&pl->contr->socket, &sl); 603 pl->contr->ns->send_packet (sl);
676 free (sl.buf); 604
677 free (map_mark); 605 free (map_mark);
678} 606}
679 607
680
681/** 608/**
682 * Send a kill log record to sockets 609 * Send a kill log record to sockets
683 */ 610 */
684
685void 611void
686Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) 612Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
687{ 613{
688 int i;
689 size_t len; 614 size_t len;
690 char buf[MAX_BUF]; 615 char buf[MAX_BUF];
691 616
692 if (With != NULL) 617 if (With != NULL)
693 {
694 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); 618 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
695 }
696 else 619 else
697 {
698 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); 620 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
699 } 621
700 len = strlen (buf); 622 len = strlen (buf);
701 for (i = 1; i < socket_info.allocated_sockets; i++)
702 {
703 if (init_sockets[i].old_mode == Old_Listen)
704 {
705 cs_write_string (&init_sockets[i], buf, len);
706 }
707 }
708} 623}
624

Diff Legend

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