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.31 by root, Tue Jan 9 21:32:43 2007 UTC vs.
Revision 1.36 by root, Mon Mar 12 01:13:10 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 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 *
… …
293 */ 293 */
294 294
295void 295void
296new_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)
297{ 297{
298 player *pl;
299
300 for_all_players (pl) 298 for_all_players (pl)
301 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 299 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
302 new_draw_info (color, 0, pl->ob, str); 300 new_draw_info (color, 0, pl->ob, str);
303} 301}
304 302
… …
307 */ 305 */
308 306
309void 307void
310new_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)
311{ 309{
312 player *pl;
313
314 for_all_players (pl) 310 for_all_players (pl)
315 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)
316 new_draw_info (color, 0, pl->ob, str); 312 new_draw_info (color, 0, pl->ob, str);
317} 313}
318 314
… …
321 */ 317 */
322 318
323void 319void
324new_info_map (int color, maptile * map, const char *str) 320new_info_map (int color, maptile * map, const char *str)
325{ 321{
326 player *pl;
327
328 for_all_players (pl) 322 for_all_players (pl)
329 if (pl->ob != NULL && pl->ob->map == map) 323 if (pl->ob != NULL && pl->ob->map == map)
330 new_draw_info (color, 0, pl->ob, str); 324 new_draw_info (color, 0, pl->ob, str);
331} 325}
332 326
… …
425 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);
426 else 420 else
427 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);
428} 422}
429 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}
430 433
431/** 434/**
432 * Helper for magic map creation. 435 * Helper for magic map creation.
433 * 436 *
434 * 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.
… …
443magic_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)
444{ 447{
445 int x, y, dx, dy, mflags; 448 int x, y, dx, dy, mflags;
446 sint16 nx, ny; 449 sint16 nx, ny;
447 maptile *mp; 450 maptile *mp;
448 New_Face *f;
449 451
450 for (dx = -1; dx <= 1; dx++) 452 for (dx = -1; dx <= 1; dx++)
451 { 453 {
452 for (dy = -1; dy <= 1; dy++) 454 for (dy = -1; dy <= 1; dy++)
453 { 455 {
… …
465 if (mflags & P_OUT_OF_MAP) 467 if (mflags & P_OUT_OF_MAP)
466 continue; 468 continue;
467 469
468 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)
469 { 471 {
470 f = GET_MAP_FACE (mp, nx, ny, 0); 472 int f = GET_MAP_FACE (mp, nx, ny, 0);
471 if (f == blank_face) 473 if (f == blank_face)
474 {
472 f = GET_MAP_FACE (mp, nx, ny, 1); 475 f = GET_MAP_FACE (mp, nx, ny, 1);
473 if (f == blank_face) 476 if (f == blank_face)
474 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;
475 481
476 /* 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
477 * work. 483 * work.
478 */ 484 */
479 if (mflags & P_BLOCKSVIEW) 485 if (mflags & P_BLOCKSVIEW)
480 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;
481 else 487 else
482 { 488 {
483 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;
484 magic_mapping_mark_recursive (pl, map_mark, x, y); 490 magic_mapping_mark_recursive (pl, map_mark, x, y);
485 } 491 }
486 } 492 }
487 } 493 }
488 } 494 }
489} 495}
490
491 496
492/** 497/**
493 * Creates magic map for player. 498 * Creates magic map for player.
494 * 499 *
495 * Note: For improved magic mapping display, the space that blocks 500 * Note: For improved magic mapping display, the space that blocks
… …
502 * is for open spaces. map_mark should already have been initialised 507 * is for open spaces. map_mark should already have been initialised
503 * to zero before this is called. 508 * to zero before this is called.
504 * strength is an initial strength*2 rectangular area that we automatically 509 * strength is an initial strength*2 rectangular area that we automatically
505 * see in/penetrate through. 510 * see in/penetrate through.
506 */ 511 */
507
508void 512void
509magic_mapping_mark (object *pl, char *map_mark, int strength) 513magic_mapping_mark (object *pl, char *map_mark, int strength)
510{ 514{
511 int x, y, mflags; 515 int x, y, mflags;
512 sint16 nx, ny; 516 sint16 nx, ny;
513 maptile *mp; 517 maptile *mp;
514 New_Face *f;
515 518
516 for (x = -strength; x < strength; x++) 519 for (x = -strength; x < strength; x++)
517 { 520 {
518 for (y = -strength; y < strength; y++) 521 for (y = -strength; y < strength; y++)
519 { 522 {
520 mp = pl->map; 523 mp = pl->map;
521 nx = pl->x + x; 524 nx = pl->x + x;
522 ny = pl->y + y; 525 ny = pl->y + y;
526
523 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 527 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
524 if (mflags & P_OUT_OF_MAP) 528 if (mflags & P_OUT_OF_MAP)
525 continue; 529 continue;
526 else 530
531 int f = GET_MAP_FACE (mp, nx, ny, 0);
532 if (f == blank_face)
527 { 533 {
528 f = GET_MAP_FACE (mp, nx, ny, 0);
529 if (f == blank_face)
530 f = GET_MAP_FACE (mp, nx, ny, 1); 534 f = GET_MAP_FACE (mp, nx, ny, 1);
531 if (f == blank_face) 535 if (f == blank_face)
532 f = GET_MAP_FACE (mp, nx, ny, 2); 536 f = GET_MAP_FACE (mp, nx, ny, 2);
533 } 537 }
534 538
539 int magicmap = faces [f].magicmap;
540
535 if (mflags & P_BLOCKSVIEW) 541 if (mflags & P_BLOCKSVIEW)
536 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;
537 else 543 else
538 { 544 {
539 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;
540 magic_mapping_mark_recursive (pl, map_mark, x, y); 546 magic_mapping_mark_recursive (pl, map_mark, x, y);
541 } 547 }
542 } 548 }
543 } 549 }
544} 550}

Diff Legend

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