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.19 by root, Thu Dec 14 20:39:54 2006 UTC vs.
Revision 1.35 by root, Sun Mar 11 02:12:45 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_socket * ns, int color, const char *str) 48esrv_print_msg (client *ns, int color, const char *str)
49{ 49{
50 packet sl;
51 sl.printf ("drawinfo %d %s", color, str); 50 ns->send_packet_printf ("drawinfo %d %s", color, str);
52 ns->send_packet (sl);
53} 51}
54 52
55/** 53/**
56 * Draws an extended message on the client. 54 * Draws an extended message on the client.
57 * ns the socket to send message to 55 * ns the socket to send message to
… …
60 * subtype type and subtype of text message 58 * subtype type and subtype of text message
61 * 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
62 * message The main message 60 * message The main message
63 */ 61 */
64static void 62static void
65esrv_print_ext_msg (client_socket * 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)
66{ 64{
67 packet sl;
68
69 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);
70 ns->send_packet (sl);
71} 66}
72 67
73/** 68/**
74 * Frontend for esrv_print_msg 69 * Frontend for esrv_print_msg
75 * \param colr message color 70 * \param colr message color
… …
78 * 73 *
79 * 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.
80 * 75 *
81 * Else sends message to player via esrv_print_msg 76 * Else sends message to player via esrv_print_msg
82 */ 77 */
83
84static void 78static void
85print_message (int colr, const object *pl, const char *tmp) 79print_message (int colr, const object *pl, const char *tmp)
86{ 80{
87
88 if (!tmp) 81 if (!tmp)
89 tmp = "[NULL]"; 82 tmp = "[NULL]";
90 83
91 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
92 return; 85 return;
93 86
94 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
95 esrv_print_msg (pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
96} 89}
97 90
98/** 91/**
99 * Prints out the contents of specified buffer structures, 92 * Prints out the contents of specified buffer structures,
100 * and clears the string. 93 * and clears the string.
101 */ 94 */
102
103void 95void
104flush_output_element (const object *pl, Output_Buf * outputs) 96flush_output_element (const object *pl, Output_Buf * outputs)
105{ 97{
106 char tbuf[MAX_BUF]; 98 char tbuf[MAX_BUF];
107 99
… …
131 * If found, checks if message should be sent now. 123 * If found, checks if message should be sent now.
132 * 124 *
133 * If message not already in buffers, flushes olders buffer, 125 * If message not already in buffers, flushes olders buffer,
134 * and adds message to queue. 126 * and adds message to queue.
135 */ 127 */
136
137static void 128static void
138check_output_buffers (const object *pl, const char *buf) 129check_output_buffers (const object *pl, const char *buf)
139{ 130{
140 int i, oldest = 0; 131 int i, oldest = 0;
141 132
… …
172 pl->contr->outputs[oldest].buf = buf; 163 pl->contr->outputs[oldest].buf = buf;
173 } 164 }
174 } 165 }
175} 166}
176 167
177
178
179/** 168/**
180 * Sends message to player(s). 169 * Sends message to player(s).
181 * 170 *
182 * flags is various flags - mostly color, plus a few specials. 171 * flags is various flags - mostly color, plus a few specials.
183 * 172 *
… …
194 */ 183 */
195 184
196void 185void
197new_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)
198{ 187{
199
200 if (flags & NDI_ALL) 188 if (flags & NDI_ALL)
201 { 189 {
202 player *tmppl; 190 for_all_players (pl)
203
204 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
205 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 191 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
206 192
207 return; 193 return;
208 } 194 }
209 195
210 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 196 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
211 {
212 /* Write to the socket? */
213 print_message (0, NULL, buf);
214 return;
215 }
216
217 if (pl->type != PLAYER)
218 return; 197 return;
219 198
220 if (pri >= pl->contr->listening) 199 if (pri >= pl->contr->listening)
221 return; 200 return;
222 201
223 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 202 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
224 /* following prints stuff out, as appropriate */
225 check_output_buffers (pl, buf); 203 check_output_buffers (pl, buf);
226 else 204 else
227 print_message (flags & NDI_COLOR_MASK, pl, buf); 205 print_message (flags & NDI_COLOR_MASK, pl, buf);
228} 206}
229 207
… …
233 * 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
234 * 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
235 * 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
236 * client/server bandwidth (client could keep track of various strings 214 * client/server bandwidth (client could keep track of various strings
237 */ 215 */
238
239void 216void
240new_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, ...)
241{ 218{
242 char buf[HUGE_BUF]; 219 char buf[HUGE_BUF];
243 220
244 va_list ap; 221 va_list ap;
245
246 va_start (ap, format); 222 va_start (ap, format);
247
248 vsnprintf (buf, HUGE_BUF, format, ap); 223 vsnprintf (buf, HUGE_BUF, format, ap);
249
250 va_end (ap); 224 va_end (ap);
251 225
252 new_draw_info (flags, pri, pl, buf); 226 new_draw_info (flags, pri, pl, buf);
253} 227}
254 228
255
256void 229void
257draw_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)
258{ 231{
259 232
260 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 233 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
261 return; 234 return;
262 235
263 if (pri >= pl->contr->listening) 236 if (pri >= pl->contr->listening)
264 return; 237 return;
265 238
266 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) 239 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
267 { 240 {
268 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 241 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
269 242
270 if (buf == NULL) 243 if (buf == NULL)
271 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 244 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
276 new_draw_info (flags, pri, pl, buf); 249 new_draw_info (flags, pri, pl, buf);
277 free (buf); 250 free (buf);
278 } 251 }
279 } 252 }
280 else 253 else
281 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);
282} 255}
283 256
284void 257void
285draw_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, ...)
286{ 259{
287
288 char buf[HUGE_BUF]; 260 char buf[HUGE_BUF];
289 261
290 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 262 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
291 return; 263 return;
292 264
293 if (pri >= pl->contr->listening) 265 if (pri >= pl->contr->listening)
294 return; 266 return;
295 267
296 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) 268 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
297 { 269 {
298 va_list ap; 270 va_list ap;
299 271
300 LOG (llevDebug, "Non supported extension text type for client.\n"); 272 LOG (llevDebug, "Non supported extension text type for client.\n");
301 va_start (ap, new_format); 273 va_start (ap, new_format);
… …
310 282
311 va_start (ap, new_format); 283 va_start (ap, new_format);
312 vsnprintf (buf, HUGE_BUF, new_format, ap); 284 vsnprintf (buf, HUGE_BUF, new_format, ap);
313 va_end (ap); 285 va_end (ap);
314 strip_media_tag (buf); 286 strip_media_tag (buf);
315 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);
316 } 288 }
317} 289}
318 290
319/** 291/**
320 * 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.
321 */ 293 */
322 294
323void 295void
324new_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)
325{ 297{
326 player *pl; 298 for_all_players (pl)
327
328 for (pl = first_player; pl != NULL; pl = pl->next)
329 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 299 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
330 {
331 new_draw_info (color, 0, pl->ob, str); 300 new_draw_info (color, 0, pl->ob, str);
332 }
333} 301}
334 302
335/** 303/**
336 * Writes to everyone on the map except op1 and op2 304 * Writes to everyone on the map except op1 and op2
337 */ 305 */
338 306
339void 307void
340new_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)
341{ 309{
342 player *pl; 310 for_all_players (pl)
343
344 for (pl = first_player; pl != NULL; pl = pl->next)
345 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)
346 {
347 new_draw_info (color, 0, pl->ob, str); 312 new_draw_info (color, 0, pl->ob, str);
348 }
349} 313}
350 314
351/** 315/**
352 * Writes to everyone on the specified map 316 * Writes to everyone on the specified map
353 */ 317 */
354 318
355void 319void
356new_info_map (int color, maptile * map, const char *str) 320new_info_map (int color, maptile * map, const char *str)
357{ 321{
358 player *pl; 322 for_all_players (pl)
359
360 for (pl = first_player; pl != NULL; pl = pl->next)
361 if (pl->ob != NULL && pl->ob->map == map) 323 if (pl->ob != NULL && pl->ob->map == map)
362 {
363 new_draw_info (color, 0, pl->ob, str); 324 new_draw_info (color, 0, pl->ob, str);
364 }
365} 325}
366
367 326
368/** 327/**
369 * This does nothing now. However, in theory, we should probably send 328 * This does nothing now. However, in theory, we should probably send
370 * 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
371 * to handle this 330 * to handle this
… …
460 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);
461 else 420 else
462 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);
463} 422}
464 423
465
466/** 424/**
467 * Helper for magic map creation. 425 * Helper for magic map creation.
468 * 426 *
469 * Takes a player, the map_mark array and an x and y starting position. 427 * Takes a player, the map_mark array and an x and y starting position.
470 * pl is the player. 428 * pl is the player.
… …
478magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 436magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
479{ 437{
480 int x, y, dx, dy, mflags; 438 int x, y, dx, dy, mflags;
481 sint16 nx, ny; 439 sint16 nx, ny;
482 maptile *mp; 440 maptile *mp;
483 New_Face *f;
484 441
485 for (dx = -1; dx <= 1; dx++) 442 for (dx = -1; dx <= 1; dx++)
486 { 443 {
487 for (dy = -1; dy <= 1; dy++) 444 for (dy = -1; dy <= 1; dy++)
488 { 445 {
… …
500 if (mflags & P_OUT_OF_MAP) 457 if (mflags & P_OUT_OF_MAP)
501 continue; 458 continue;
502 459
503 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 460 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
504 { 461 {
505 f = GET_MAP_FACE (mp, nx, ny, 0); 462 int f = GET_MAP_FACE (mp, nx, ny, 0);
506 if (f == blank_face) 463 if (f == blank_face)
464 {
507 f = GET_MAP_FACE (mp, nx, ny, 1); 465 f = GET_MAP_FACE (mp, nx, ny, 1);
508 if (f == blank_face) 466 if (f == blank_face)
509 f = GET_MAP_FACE (mp, nx, ny, 2); 467 f = GET_MAP_FACE (mp, nx, ny, 2);
468 }
469
470 int magicmap = faces [f].magicmap;
510 471
511 /* Should probably have P_NO_MAGIC here also, but then shops don't 472 /* Should probably have P_NO_MAGIC here also, but then shops don't
512 * work. 473 * work.
513 */ 474 */
514 if (mflags & P_BLOCKSVIEW) 475 if (mflags & P_BLOCKSVIEW)
515 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 476 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
516 else 477 else
517 { 478 {
518 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 479 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
519 magic_mapping_mark_recursive (pl, map_mark, x, y); 480 magic_mapping_mark_recursive (pl, map_mark, x, y);
520 } 481 }
521 } 482 }
522 } 483 }
523 } 484 }
524} 485}
525
526 486
527/** 487/**
528 * Creates magic map for player. 488 * Creates magic map for player.
529 * 489 *
530 * Note: For improved magic mapping display, the space that blocks 490 * Note: For improved magic mapping display, the space that blocks
… …
532 * being nonzero have been changed to check for 1. Also, since 492 * being nonzero have been changed to check for 1. Also, since
533 * map_mark is a char value, putting 2 in should cause no problems. 493 * map_mark is a char value, putting 2 in should cause no problems.
534 * 494 *
535 * This function examines the map the player is on, and determines what 495 * This function examines the map the player is on, and determines what
536 * is visible. 2 is set for walls or objects that blocks view. 1 496 * is visible. 2 is set for walls or objects that blocks view. 1
537 * is for open spaces. map_mark should already have been initialized 497 * is for open spaces. map_mark should already have been initialised
538 * to zero before this is called. 498 * to zero before this is called.
539 * strength is an initial strength*2 rectangular area that we automatically 499 * strength is an initial strength*2 rectangular area that we automatically
540 * see in/penetrate through. 500 * see in/penetrate through.
541 */ 501 */
542
543void 502void
544magic_mapping_mark (object *pl, char *map_mark, int strength) 503magic_mapping_mark (object *pl, char *map_mark, int strength)
545{ 504{
546 int x, y, mflags; 505 int x, y, mflags;
547 sint16 nx, ny; 506 sint16 nx, ny;
548 maptile *mp; 507 maptile *mp;
549 New_Face *f;
550 508
551 for (x = -strength; x < strength; x++) 509 for (x = -strength; x < strength; x++)
552 { 510 {
553 for (y = -strength; y < strength; y++) 511 for (y = -strength; y < strength; y++)
554 { 512 {
555 mp = pl->map; 513 mp = pl->map;
556 nx = pl->x + x; 514 nx = pl->x + x;
557 ny = pl->y + y; 515 ny = pl->y + y;
516
558 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 517 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
559 if (mflags & P_OUT_OF_MAP) 518 if (mflags & P_OUT_OF_MAP)
560 continue; 519 continue;
561 else 520
521 int f = GET_MAP_FACE (mp, nx, ny, 0);
522 if (f == blank_face)
562 { 523 {
563 f = GET_MAP_FACE (mp, nx, ny, 0);
564 if (f == blank_face)
565 f = GET_MAP_FACE (mp, nx, ny, 1); 524 f = GET_MAP_FACE (mp, nx, ny, 1);
566 if (f == blank_face) 525 if (f == blank_face)
567 f = GET_MAP_FACE (mp, nx, ny, 2); 526 f = GET_MAP_FACE (mp, nx, ny, 2);
568 } 527 }
569 528
529 int magicmap = faces [f].magicmap;
530
570 if (mflags & P_BLOCKSVIEW) 531 if (mflags & P_BLOCKSVIEW)
571 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 532 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
572 else 533 else
573 { 534 {
574 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 535 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
575 magic_mapping_mark_recursive (pl, map_mark, x, y); 536 magic_mapping_mark_recursive (pl, map_mark, x, y);
576 } 537 }
577 } 538 }
578 } 539 }
579} 540}
580 541
581
582/** 542/**
583 * Creates and sends magic map to player. 543 * Creates and sends magic map to player.
584 * 544 *
585 * The following function is a lot messier than it really should be, 545 * The following function is a lot messier than it really should be,
586 * but there is no real easy solution. 546 * but there is no real easy solution.
587 * 547 *
588 * Mark Wedel 548 * Mark Wedel
589 */ 549 */
590
591void 550void
592draw_magic_map (object *pl) 551draw_magic_map (object *pl)
593{ 552{
594 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 553 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
595 int xmin, xmax, ymin, ymax; 554 int xmin, xmax, ymin, ymax;
… …
613 xmax = 0; 572 xmax = 0;
614 ymax = 0; 573 ymax = 0;
615 574
616 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 575 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
617 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 576 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
618 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 577 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
619 { 578 {
620 xmin = x < xmin ? x : xmin; 579 xmin = x < xmin ? x : xmin;
621 xmax = x > xmax ? x : xmax; 580 xmax = x > xmax ? x : xmax;
622 ymin = y < ymin ? y : ymin; 581 ymin = y < ymin ? y : ymin;
623 ymax = y > ymax ? y : ymax; 582 ymax = y > ymax ? y : ymax;
… …
629 588
630 for (int y = ymin; y <= ymax; y++) 589 for (int y = ymin; y <= ymax; y++)
631 for (int x = xmin; x <= xmax; x++) 590 for (int x = xmin; x <= xmax; x++)
632 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); 591 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
633 592
634 pl->contr->socket->send_packet (sl); 593 pl->contr->ns->send_packet (sl);
635 594
636 free (map_mark); 595 free (map_mark);
637} 596}
638 597
639
640/** 598/**
641 * Send a kill log record to sockets 599 * Send a kill log record to sockets
642 */ 600 */
643
644void 601void
645Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) 602Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
646{ 603{
647 size_t len; 604 size_t len;
648 char buf[MAX_BUF]; 605 char buf[MAX_BUF];
… …
652 else 609 else
653 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); 610 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
654 611
655 len = strlen (buf); 612 len = strlen (buf);
656} 613}
614

Diff Legend

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