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.36 by root, Mon Mar 12 01:13:10 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/** 91/**
94 * Prints out the contents of specified buffer structures, 92 * Prints out the contents of specified buffer structures,
95 * and clears the string. 93 * and clears the string.
96 */ 94 */
97
98void 95void
99flush_output_element (const object *pl, Output_Buf * outputs) 96flush_output_element (const object *pl, Output_Buf * outputs)
100{ 97{
101 char tbuf[MAX_BUF]; 98 char tbuf[MAX_BUF];
102 99
… …
126 * If found, checks if message should be sent now. 123 * If found, checks if message should be sent now.
127 * 124 *
128 * If message not already in buffers, flushes olders buffer, 125 * If message not already in buffers, flushes olders buffer,
129 * and adds message to queue. 126 * and adds message to queue.
130 */ 127 */
131
132static void 128static void
133check_output_buffers (const object *pl, const char *buf) 129check_output_buffers (const object *pl, const char *buf)
134{ 130{
135 int i, oldest = 0; 131 int i, oldest = 0;
136 132
… …
167 pl->contr->outputs[oldest].buf = buf; 163 pl->contr->outputs[oldest].buf = buf;
168 } 164 }
169 } 165 }
170} 166}
171 167
172
173
174/** 168/**
175 * Sends message to player(s). 169 * Sends message to player(s).
176 * 170 *
177 * flags is various flags - mostly color, plus a few specials. 171 * flags is various flags - mostly color, plus a few specials.
178 * 172 *
… …
189 */ 183 */
190 184
191void 185void
192new_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)
193{ 187{
194
195 if (flags & NDI_ALL) 188 if (flags & NDI_ALL)
196 { 189 {
197 player *tmppl; 190 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); 191 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
201 192
202 return; 193 return;
203 } 194 }
204 195
205 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 196 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; 197 return;
214 198
215 if (pri >= pl->contr->listening) 199 if (pri >= pl->contr->listening)
216 return; 200 return;
217 201
218 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 202 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
219 /* following prints stuff out, as appropriate */
220 check_output_buffers (pl, buf); 203 check_output_buffers (pl, buf);
221 else 204 else
222 print_message (flags & NDI_COLOR_MASK, pl, buf); 205 print_message (flags & NDI_COLOR_MASK, pl, buf);
223} 206}
224 207
… …
228 * 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
229 * 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
230 * 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
231 * client/server bandwidth (client could keep track of various strings 214 * client/server bandwidth (client could keep track of various strings
232 */ 215 */
233
234void 216void
235new_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, ...)
236{ 218{
237 char buf[HUGE_BUF]; 219 char buf[HUGE_BUF];
238 220
239 va_list ap; 221 va_list ap;
240
241 va_start (ap, format); 222 va_start (ap, format);
242
243 vsnprintf (buf, HUGE_BUF, format, ap); 223 vsnprintf (buf, HUGE_BUF, format, ap);
244
245 va_end (ap); 224 va_end (ap);
246 225
247 new_draw_info (flags, pri, pl, buf); 226 new_draw_info (flags, pri, pl, buf);
248} 227}
249 228
250
251void 229void
252draw_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)
253{ 231{
254 232
255 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 233 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
256 return; 234 return;
257 235
258 if (pri >= pl->contr->listening) 236 if (pri >= pl->contr->listening)
259 return; 237 return;
260 238
261 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) 239 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
262 { 240 {
263 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 241 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
264 242
265 if (buf == NULL) 243 if (buf == NULL)
266 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 244 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
271 new_draw_info (flags, pri, pl, buf); 249 new_draw_info (flags, pri, pl, buf);
272 free (buf); 250 free (buf);
273 } 251 }
274 } 252 }
275 else 253 else
276 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);
277} 255}
278 256
279void 257void
280draw_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, ...)
281{ 259{
282
283 char buf[HUGE_BUF]; 260 char buf[HUGE_BUF];
284 261
285 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 262 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
286 return; 263 return;
287 264
288 if (pri >= pl->contr->listening) 265 if (pri >= pl->contr->listening)
289 return; 266 return;
290 267
291 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) 268 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
292 { 269 {
293 va_list ap; 270 va_list ap;
294 271
295 LOG (llevDebug, "Non supported extension text type for client.\n"); 272 LOG (llevDebug, "Non supported extension text type for client.\n");
296 va_start (ap, new_format); 273 va_start (ap, new_format);
… …
305 282
306 va_start (ap, new_format); 283 va_start (ap, new_format);
307 vsnprintf (buf, HUGE_BUF, new_format, ap); 284 vsnprintf (buf, HUGE_BUF, new_format, ap);
308 va_end (ap); 285 va_end (ap);
309 strip_media_tag (buf); 286 strip_media_tag (buf);
310 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);
311 } 288 }
312} 289}
313 290
314/** 291/**
315 * 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.
316 */ 293 */
317 294
318void 295void
319new_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)
320{ 297{
321 player *pl; 298 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) 299 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
325 {
326 new_draw_info (color, 0, pl->ob, str); 300 new_draw_info (color, 0, pl->ob, str);
327 }
328} 301}
329 302
330/** 303/**
331 * Writes to everyone on the map except op1 and op2 304 * Writes to everyone on the map except op1 and op2
332 */ 305 */
333 306
334void 307void
335new_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)
336{ 309{
337 player *pl; 310 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) 311 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
341 {
342 new_draw_info (color, 0, pl->ob, str); 312 new_draw_info (color, 0, pl->ob, str);
343 }
344} 313}
345 314
346/** 315/**
347 * Writes to everyone on the specified map 316 * Writes to everyone on the specified map
348 */ 317 */
349 318
350void 319void
351new_info_map (int color, maptile * map, const char *str) 320new_info_map (int color, maptile * map, const char *str)
352{ 321{
353 player *pl; 322 for_all_players (pl)
354
355 for (pl = first_player; pl != NULL; pl = pl->next)
356 if (pl->ob != NULL && pl->ob->map == map) 323 if (pl->ob != NULL && pl->ob->map == map)
357 {
358 new_draw_info (color, 0, pl->ob, str); 324 new_draw_info (color, 0, pl->ob, str);
359 }
360} 325}
361
362 326
363/** 327/**
364 * This does nothing now. However, in theory, we should probably send 328 * 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 329 * something to the client and let the client figure out how it might want
366 * to handle this 330 * to handle this
… …
455 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);
456 else 420 else
457 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);
458} 422}
459 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}
460 433
461/** 434/**
462 * Helper for magic map creation. 435 * Helper for magic map creation.
463 * 436 *
464 * 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.
… …
473magic_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)
474{ 447{
475 int x, y, dx, dy, mflags; 448 int x, y, dx, dy, mflags;
476 sint16 nx, ny; 449 sint16 nx, ny;
477 maptile *mp; 450 maptile *mp;
478 New_Face *f;
479 451
480 for (dx = -1; dx <= 1; dx++) 452 for (dx = -1; dx <= 1; dx++)
481 { 453 {
482 for (dy = -1; dy <= 1; dy++) 454 for (dy = -1; dy <= 1; dy++)
483 { 455 {
… …
495 if (mflags & P_OUT_OF_MAP) 467 if (mflags & P_OUT_OF_MAP)
496 continue; 468 continue;
497 469
498 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)
499 { 471 {
500 f = GET_MAP_FACE (mp, nx, ny, 0); 472 int f = GET_MAP_FACE (mp, nx, ny, 0);
501 if (f == blank_face) 473 if (f == blank_face)
474 {
502 f = GET_MAP_FACE (mp, nx, ny, 1); 475 f = GET_MAP_FACE (mp, nx, ny, 1);
503 if (f == blank_face) 476 if (f == blank_face)
504 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;
505 481
506 /* 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
507 * work. 483 * work.
508 */ 484 */
509 if (mflags & P_BLOCKSVIEW) 485 if (mflags & P_BLOCKSVIEW)
510 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;
511 else 487 else
512 { 488 {
513 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;
514 magic_mapping_mark_recursive (pl, map_mark, x, y); 490 magic_mapping_mark_recursive (pl, map_mark, x, y);
515 } 491 }
516 } 492 }
517 } 493 }
518 } 494 }
519} 495}
520
521 496
522/** 497/**
523 * Creates magic map for player. 498 * Creates magic map for player.
524 * 499 *
525 * Note: For improved magic mapping display, the space that blocks 500 * Note: For improved magic mapping display, the space that blocks
… …
527 * being nonzero have been changed to check for 1. Also, since 502 * 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. 503 * map_mark is a char value, putting 2 in should cause no problems.
529 * 504 *
530 * 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
531 * 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
532 * is for open spaces. map_mark should already have been initialized 507 * is for open spaces. map_mark should already have been initialised
533 * to zero before this is called. 508 * to zero before this is called.
534 * strength is an initial strength*2 rectangular area that we automatically 509 * strength is an initial strength*2 rectangular area that we automatically
535 * see in/penetrate through. 510 * see in/penetrate through.
536 */ 511 */
537
538void 512void
539magic_mapping_mark (object *pl, char *map_mark, int strength) 513magic_mapping_mark (object *pl, char *map_mark, int strength)
540{ 514{
541 int x, y, mflags; 515 int x, y, mflags;
542 sint16 nx, ny; 516 sint16 nx, ny;
543 maptile *mp; 517 maptile *mp;
544 New_Face *f;
545 518
546 for (x = -strength; x < strength; x++) 519 for (x = -strength; x < strength; x++)
547 { 520 {
548 for (y = -strength; y < strength; y++) 521 for (y = -strength; y < strength; y++)
549 { 522 {
550 mp = pl->map; 523 mp = pl->map;
551 nx = pl->x + x; 524 nx = pl->x + x;
552 ny = pl->y + y; 525 ny = pl->y + y;
526
553 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 527 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
554 if (mflags & P_OUT_OF_MAP) 528 if (mflags & P_OUT_OF_MAP)
555 continue; 529 continue;
556 else 530
531 int f = GET_MAP_FACE (mp, nx, ny, 0);
532 if (f == blank_face)
557 { 533 {
558 f = GET_MAP_FACE (mp, nx, ny, 0);
559 if (f == blank_face)
560 f = GET_MAP_FACE (mp, nx, ny, 1); 534 f = GET_MAP_FACE (mp, nx, ny, 1);
561 if (f == blank_face) 535 if (f == blank_face)
562 f = GET_MAP_FACE (mp, nx, ny, 2); 536 f = GET_MAP_FACE (mp, nx, ny, 2);
563 } 537 }
564 538
539 int magicmap = faces [f].magicmap;
540
565 if (mflags & P_BLOCKSVIEW) 541 if (mflags & P_BLOCKSVIEW)
566 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;
567 else 543 else
568 { 544 {
569 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;
570 magic_mapping_mark_recursive (pl, map_mark, x, y); 546 magic_mapping_mark_recursive (pl, map_mark, x, y);
571 } 547 }
572 } 548 }
573 } 549 }
574} 550}
575 551
576
577/** 552/**
578 * Creates and sends magic map to player. 553 * Creates and sends magic map to player.
579 * 554 *
580 * 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,
581 * but there is no real easy solution. 556 * but there is no real easy solution.
582 * 557 *
583 * Mark Wedel 558 * Mark Wedel
584 */ 559 */
585
586void 560void
587draw_magic_map (object *pl) 561draw_magic_map (object *pl)
588{ 562{
589 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);
590 int xmin, xmax, ymin, ymax; 564 int xmin, xmax, ymin, ymax;
… …
608 xmax = 0; 582 xmax = 0;
609 ymax = 0; 583 ymax = 0;
610 584
611 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 585 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
612 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 586 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
613 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 587 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
614 { 588 {
615 xmin = x < xmin ? x : xmin; 589 xmin = x < xmin ? x : xmin;
616 xmax = x > xmax ? x : xmax; 590 xmax = x > xmax ? x : xmax;
617 ymin = y < ymin ? y : ymin; 591 ymin = y < ymin ? y : ymin;
618 ymax = y > ymax ? y : ymax; 592 ymax = y > ymax ? y : ymax;
… …
624 598
625 for (int y = ymin; y <= ymax; y++) 599 for (int y = ymin; y <= ymax; y++)
626 for (int x = xmin; x <= xmax; x++) 600 for (int x = xmin; x <= xmax; x++)
627 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); 601 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
628 602
629 pl->contr->socket->send_packet (sl); 603 pl->contr->ns->send_packet (sl);
630 604
631 free (map_mark); 605 free (map_mark);
632} 606}
633 607
634
635/** 608/**
636 * Send a kill log record to sockets 609 * Send a kill log record to sockets
637 */ 610 */
638
639void 611void
640Log_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)
641{ 613{
642 size_t len; 614 size_t len;
643 char buf[MAX_BUF]; 615 char buf[MAX_BUF];
… …
647 else 619 else
648 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);
649 621
650 len = strlen (buf); 622 len = strlen (buf);
651} 623}
624

Diff Legend

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