ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.96 by root, Thu Mar 15 14:23:02 2007 UTC vs.
Revision 1.128 by root, Sun Sep 9 06:25:45 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <unistd.h> 24#include <unistd.h>
26 25
27#include "global.h" 26#include "global.h"
28#include "funcpoint.h" 27#include "funcpoint.h"
29 28
30#include "loader.h" 29#include "loader.h"
31 30
32#include "path.h" 31#include "path.h"
33
34/*
35 * This makes a path absolute outside the world of Crossfire.
36 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
37 * and returns the pointer to a static array containing the result.
38 * it really should be called create_mapname
39 */
40const char *
41create_pathname (const char *name)
42{
43 static char buf[8192];
44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
45 return buf;
46}
47
48/*
49 * This function checks if a file with the given path exists.
50 * -1 is returned if it fails, otherwise the mode of the file
51 * is returned.
52 * It tries out all the compression suffixes listed in the uncomp[] array.
53 *
54 * If prepend_dir is set, then we call create_pathname (which prepends
55 * libdir & mapdir). Otherwise, we assume the name given is fully
56 * complete.
57 * Only the editor actually cares about the writablity of this -
58 * the rest of the code only cares that the file is readable.
59 * when the editor goes away, the call to stat should probably be
60 * replaced by an access instead (similar to the windows one, but
61 * that seems to be missing the prepend_dir processing
62 */
63int
64check_path (const char *name, int prepend_dir)
65{
66 char buf[MAX_BUF];
67
68 char *endbuf;
69 struct stat statbuf;
70 int mode = 0;
71
72 if (prepend_dir)
73 assign (buf, create_pathname (name));
74 else
75 assign (buf, name);
76
77 /* old method (strchr(buf, '\0')) seemd very odd to me -
78 * this method should be equivalant and is clearer.
79 * Can not use strcat because we need to cycle through
80 * all the names.
81 */
82 endbuf = buf + strlen (buf);
83
84 if (stat (buf, &statbuf))
85 return -1;
86 if (!S_ISREG (statbuf.st_mode))
87 return (-1);
88
89 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
90 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
91 mode |= 4;
92
93 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
94 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
95 mode |= 2;
96
97 return (mode);
98}
99 32
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 36 * new values into newmap, nx, and ny. Any and all of those
… …
174 * let the player through (inventory checkers for example) 107 * let the player through (inventory checkers for example)
175 */ 108 */
176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 109 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177 return 0; 110 return 0;
178 111
179 if (ob->head != NULL)
180 ob = ob->head; 112 ob = ob->head_ ();
181 113
182 /* We basically go through the stack of objects, and if there is 114 /* We basically go through the stack of objects, and if there is
183 * some other object that has NO_PASS or FLAG_ALIVE set, return 115 * some other object that has NO_PASS or FLAG_ALIVE set, return
184 * true. If we get through the entire stack, that must mean 116 * true. If we get through the entire stack, that must mean
185 * ob is blocking it, so return 0. 117 * ob is blocking it, so return 0.
… …
215 else 147 else
216 { 148 {
217 /* Broke apart a big nasty if into several here to make 149 /* Broke apart a big nasty if into several here to make
218 * this more readable. first check - if the space blocks 150 * this more readable. first check - if the space blocks
219 * movement, can't move here. 151 * movement, can't move here.
220 * second - if a monster, can't move there, unles it is a 152 * second - if a monster, can't move there, unless it is a
221 * hidden dm 153 * hidden dm
222 */ 154 */
223 if (OB_MOVE_BLOCK (ob, tmp)) 155 if (OB_MOVE_BLOCK (ob, tmp))
224 return 1; 156 return 1;
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 157
226 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 158 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob
160 && tmp != ob
161 && tmp->type != DOOR
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
227 return 1; 163 return 1;
228 } 164 }
229 165
230 } 166 }
231 return 0; 167 return 0;
… …
273 209
274 /* don't have object, so don't know what types would block */ 210 /* don't have object, so don't know what types would block */
275 return m1->at (sx, sy).move_block; 211 return m1->at (sx, sy).move_block;
276 } 212 }
277 213
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
279 { 215 {
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
281 217
282 if (flag & P_OUT_OF_MAP) 218 if (flag & P_OUT_OF_MAP)
283 return P_OUT_OF_MAP; 219 return P_OUT_OF_MAP;
284 if (flag & P_IS_ALIVE) 220 if (flag & P_IS_ALIVE)
285 return P_IS_ALIVE; 221 return P_IS_ALIVE;
… …
344} 280}
345 281
346/* link_multipart_objects go through all the objects on the map looking 282/* link_multipart_objects go through all the objects on the map looking
347 * for objects whose arch says they are multipart yet according to the 283 * for objects whose arch says they are multipart yet according to the
348 * info we have, they only have the head (as would be expected when 284 * info we have, they only have the head (as would be expected when
349 * they are saved). We do have to look for the old maps that did save 285 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 286 */
352void 287void
353maptile::link_multipart_objects () 288maptile::link_multipart_objects ()
354{ 289{
355 if (!spaces) 290 if (!spaces)
356 return; 291 return;
357 292
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 293 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 294 {
295 object *op = ms->bot;
296 while (op)
360 { 297 {
361 /* already multipart - don't do anything more */ 298 /* already multipart - don't do anything more */
362 if (!tmp->head && !tmp->more) 299 if (op->head_ () == op && !op->more && op->arch->more)
363 {
364 /* If there is nothing more to this object, this for loop
365 * won't do anything.
366 */
367 archetype *at;
368 object *last, *op;
369 for (at = tmp->arch->more, last = tmp;
370 at;
371 at = at->more, last = op)
372 { 300 {
373 op = arch_to_object (at); 301 op->remove ();
302 op->expand_tail ();
374 303
375 /* update x,y coordinates */ 304 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
376 op->x += tmp->x; 305 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
377 op->y += tmp->y; 306 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
378 op->head = tmp;
379 op->map = this;
380 last->more = op;
381 op->name = tmp->name;
382 op->title = tmp->title;
383
384 /* we could link all the parts onto tmp, and then just
385 * call insert_ob_in_map once, but the effect is the same,
386 * as insert_ob_in_map will call itself with each part, and
387 * the coding is simpler to just to it here with each part.
388 */
389 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 307 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
308
309 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
310 // so we have to reset the iteration through the mapspace
390 } 311 }
312 else
313 op = op->above;
391 } 314 }
392 } 315 }
393} 316}
394 317
395/* 318/*
396 * Loads (ands parses) the objects into a given map from the specified 319 * Loads (ands parses) the objects into a given map from the specified
397 * file pointer. 320 * file pointer.
… …
399bool 322bool
400maptile::_load_objects (object_thawer &f) 323maptile::_load_objects (object_thawer &f)
401{ 324{
402 for (;;) 325 for (;;)
403 { 326 {
404 coroapi::cede_every (1000); // cede once in a while 327 coroapi::cede_to_tick_every (100); // cede once in a while
405 328
406 switch (f.kw) 329 switch (f.kw)
407 { 330 {
408 case KW_arch: 331 case KW_arch:
409 if (object *op = object::read (f, this)) 332 if (object *op = object::read (f, this))
… …
432} 355}
433 356
434void 357void
435maptile::activate () 358maptile::activate ()
436{ 359{
437 if (!spaces) 360 if (spaces)
438 return;
439
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 361 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 362 for (object *op = ms->bot; op; op = op->above)
442 op->activate_recursive (); 363 op->activate_recursive ();
443} 364}
444 365
445void 366void
446maptile::deactivate () 367maptile::deactivate ()
447{ 368{
448 if (!spaces) 369 if (spaces)
449 return;
450
451 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
452 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
453 op->deactivate_recursive (); 372 op->deactivate_recursive ();
454} 373}
455 374
456bool 375bool
457maptile::_save_objects (object_freezer &f, int flags) 376maptile::_save_objects (object_freezer &f, int flags)
458{ 377{
459 static int cede_count = 0; 378 coroapi::cede_to_tick ();
460 379
461 if (flags & IO_HEADER) 380 if (flags & IO_HEADER)
462 _save_header (f); 381 _save_header (f);
463 382
464 if (!spaces) 383 if (!spaces)
465 return false; 384 return false;
466 385
467 for (int i = 0; i < size (); ++i) 386 for (int i = 0; i < size (); ++i)
468 { 387 {
469 if (cede_count >= 500)
470 {
471 cede_count = 0;
472 coroapi::cede ();
473 }
474
475 int unique = 0; 388 bool unique = 0;
389
476 for (object *op = spaces [i].bot; op; op = op->above) 390 for (object *op = spaces [i].bot; op; op = op->above)
477 { 391 {
478 // count per-object, but cede only when modification-safe
479 cede_count++;
480
481 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 392 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
482 unique = 1;
483 393
484 if (!op->can_map_save ()) 394 if (expect_false (!op->can_map_save ()))
485 continue; 395 continue;
486 396
487 if (unique || op->flag [FLAG_UNIQUE]) 397 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
488 { 398 {
489 if (flags & IO_UNIQUES) 399 if (flags & IO_UNIQUES)
490 op->write (f); 400 op->write (f);
491 } 401 }
492 else if (flags & IO_OBJECTS) 402 else if (expect_true (flags & IO_OBJECTS))
493 op->write (f); 403 op->write (f);
494 } 404 }
495 } 405 }
496 406
407 coroapi::cede_to_tick ();
408
497 return true; 409 return true;
498}
499
500bool
501maptile::_load_objects (const char *path, bool skip_header)
502{
503 object_thawer f (path);
504
505 if (!f)
506 return false;
507
508 f.next ();
509
510 if (skip_header)
511 for (;;)
512 {
513 keyword kw = f.kw;
514 f.skip ();
515 if (kw == KW_end)
516 break;
517 }
518
519 return _load_objects (f);
520} 410}
521 411
522bool 412bool
523maptile::_save_objects (const char *path, int flags) 413maptile::_save_objects (const char *path, int flags)
524{ 414{
… …
699bool 589bool
700maptile::_load_header (object_thawer &thawer) 590maptile::_load_header (object_thawer &thawer)
701{ 591{
702 for (;;) 592 for (;;)
703 { 593 {
704 keyword kw = thawer.get_kv ();
705
706 switch (kw) 594 switch (thawer.kw)
707 { 595 {
708 case KW_msg: 596 case KW_msg:
709 thawer.get_ml (KW_endmsg, msg); 597 thawer.get_ml (KW_endmsg, msg);
710 break; 598 break;
711 599
… …
743 case KW_winddir: thawer.get (winddir); break; 631 case KW_winddir: thawer.get (winddir); break;
744 case KW_sky: thawer.get (sky); break; 632 case KW_sky: thawer.get (sky); break;
745 633
746 case KW_per_player: thawer.get (per_player); break; 634 case KW_per_player: thawer.get (per_player); break;
747 case KW_per_party: thawer.get (per_party); break; 635 case KW_per_party: thawer.get (per_party); break;
636 case KW_no_reset: thawer.get (no_reset); break;
748 637
749 case KW_region: default_region = region::find (thawer.get_str ()); break; 638 case KW_region: default_region = region::find (thawer.get_str ()); break;
750 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 639 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
751 640
752 // old names new names 641 // old names new names
… …
763 case KW_tile_path_1: thawer.get (tile_path [0]); break; 652 case KW_tile_path_1: thawer.get (tile_path [0]); break;
764 case KW_tile_path_2: thawer.get (tile_path [1]); break; 653 case KW_tile_path_2: thawer.get (tile_path [1]); break;
765 case KW_tile_path_3: thawer.get (tile_path [2]); break; 654 case KW_tile_path_3: thawer.get (tile_path [2]); break;
766 case KW_tile_path_4: thawer.get (tile_path [3]); break; 655 case KW_tile_path_4: thawer.get (tile_path [3]); break;
767 656
657 case KW_ERROR:
658 set_key_text (thawer.kw_str, thawer.value);
659 break;
660
768 case KW_end: 661 case KW_end:
662 thawer.next ();
769 return true; 663 return true;
770 664
771 default: 665 default:
772 if (!thawer.parse_error ("map", 0)) 666 if (!thawer.parse_error ("map", 0))
773 return false; 667 return false;
774 break; 668 break;
775 } 669 }
670
671 thawer.next ();
776 } 672 }
777 673
778 abort (); 674 abort ();
779}
780
781bool
782maptile::_load_header (const char *path)
783{
784 object_thawer thawer (path);
785
786 if (!thawer)
787 return false;
788
789 return _load_header (thawer);
790} 675}
791 676
792/****************************************************************************** 677/******************************************************************************
793 * This is the start of unique map handling code 678 * This is the start of unique map handling code
794 *****************************************************************************/ 679 *****************************************************************************/
… …
805 object *above = op->above; 690 object *above = op->above;
806 691
807 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 692 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
808 unique = 1; 693 unique = 1;
809 694
810 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 695 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
811 { 696 {
812 op->destroy_inv (false); 697 op->destroy_inv (false);
813 op->destroy (); 698 op->destroy ();
814 } 699 }
815 700
… …
829 if (name) MAP_OUT (name); 714 if (name) MAP_OUT (name);
830 MAP_OUT (swap_time); 715 MAP_OUT (swap_time);
831 MAP_OUT (reset_time); 716 MAP_OUT (reset_time);
832 MAP_OUT (reset_timeout); 717 MAP_OUT (reset_timeout);
833 MAP_OUT (fixed_resettime); 718 MAP_OUT (fixed_resettime);
719 MAP_OUT (no_reset);
834 MAP_OUT (difficulty); 720 MAP_OUT (difficulty);
835 721
836 if (default_region) MAP_OUT2 (region, default_region->name); 722 if (default_region) MAP_OUT2 (region, default_region->name);
837 723
838 if (shopitems) 724 if (shopitems)
… …
892 * Remove and free all objects in the given map. 778 * Remove and free all objects in the given map.
893 */ 779 */
894void 780void
895maptile::clear () 781maptile::clear ()
896{ 782{
897 sfree (regions, size ()), regions = 0;
898 free (regionmap), regionmap = 0;
899
900 if (spaces) 783 if (spaces)
901 { 784 {
902 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 785 for (mapspace *ms = spaces + size (); ms-- > spaces; )
903 while (object *op = ms->bot) 786 while (object *op = ms->bot)
904 { 787 {
788 // manually remove, as to not trigger anything
789 if (ms->bot = op->above)
790 ms->bot->below = 0;
791
792 op->flag [FLAG_REMOVED] = true;
793
794 object *head = op->head_ ();
905 if (op->head) 795 if (op == head)
906 op = op->head; 796 {
907
908 op->destroy_inv (false); 797 op->destroy_inv (false);
909 op->destroy (); 798 op->destroy ();
799 }
800 else if (head->map != op->map)
801 {
802 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
803 head->destroy ();
804 }
910 } 805 }
911 806
912 sfree (spaces, size ()), spaces = 0; 807 sfree (spaces, size ()), spaces = 0;
913 } 808 }
914 809
915 if (buttons) 810 if (buttons)
916 free_objectlinkpt (buttons), buttons = 0; 811 free_objectlinkpt (buttons), buttons = 0;
812
813 sfree (regions, size ()); regions = 0;
814 delete [] regionmap; regionmap = 0;
917} 815}
918 816
919void 817void
920maptile::clear_header () 818maptile::clear_header ()
921{ 819{
… …
951maptile::do_destroy () 849maptile::do_destroy ()
952{ 850{
953 attachable::do_destroy (); 851 attachable::do_destroy ();
954 852
955 clear (); 853 clear ();
854}
855
856/* decay and destroy perishable items in a map */
857void
858maptile::do_decay_objects ()
859{
860 if (!spaces)
861 return;
862
863 for (mapspace *ms = spaces + size (); ms-- > spaces; )
864 for (object *above, *op = ms->bot; op; op = above)
865 {
866 above = op->above;
867
868 bool destroy = 0;
869
870 // do not decay anything above unique floor tiles (yet :)
871 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
872 break;
873
874 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
875 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
876 || QUERY_FLAG (op, FLAG_UNIQUE)
877 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
878 || QUERY_FLAG (op, FLAG_UNPAID)
879 || op->is_alive ())
880 ; // do not decay
881 else if (op->is_weapon ())
882 {
883 op->stats.dam--;
884 if (op->stats.dam < 0)
885 destroy = 1;
886 }
887 else if (op->is_armor ())
888 {
889 op->stats.ac--;
890 if (op->stats.ac < 0)
891 destroy = 1;
892 }
893 else if (op->type == FOOD)
894 {
895 op->stats.food -= rndm (5, 20);
896 if (op->stats.food < 0)
897 destroy = 1;
898 }
899 else
900 {
901 int mat = op->materials;
902
903 if (mat & M_PAPER
904 || mat & M_LEATHER
905 || mat & M_WOOD
906 || mat & M_ORGANIC
907 || mat & M_CLOTH
908 || mat & M_LIQUID
909 || (mat & M_IRON && rndm (1, 5) == 1)
910 || (mat & M_GLASS && rndm (1, 2) == 1)
911 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
912 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
913 || (mat & M_ICE && temp > 32))
914 destroy = 1;
915 }
916
917 /* adjust overall chance below */
918 if (destroy && rndm (0, 1))
919 op->destroy ();
920 }
956} 921}
957 922
958/* 923/*
959 * Updates every button on the map (by calling update_button() for them). 924 * Updates every button on the map (by calling update_button() for them).
960 */ 925 */
… …
1008 if (QUERY_FLAG (op, FLAG_GENERATOR)) 973 if (QUERY_FLAG (op, FLAG_GENERATOR))
1009 { 974 {
1010 total_exp += op->stats.exp; 975 total_exp += op->stats.exp;
1011 976
1012 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 977 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1013 total_exp += at->clone.stats.exp * 8; 978 total_exp += at->stats.exp * 8;
1014 979
1015 monster_cnt++; 980 monster_cnt++;
1016 } 981 }
1017 } 982 }
1018 983
… …
1240 vol += op->volume (); 1205 vol += op->volume ();
1241 1206
1242 return vol; 1207 return vol;
1243} 1208}
1244 1209
1245/* this updates the orig_map->tile_map[tile_num] value after finding 1210bool
1246 * the map. It also takes care of linking back the freshly found 1211maptile::tile_available (int dir, bool load)
1247 * maps tile_map values if it tiles back to this one. It returns
1248 * the value of orig_map->tile_map[tile_num].
1249 */
1250static inline maptile *
1251find_and_link (maptile *orig_map, int tile_num)
1252{ 1212{
1253 maptile *mp = orig_map->tile_map [tile_num]; 1213 if (!tile_path[dir])
1214 return 0;
1254 1215
1255 if (!mp) 1216 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1256 { 1217 return 1;
1257 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1258 1218
1259 if (!mp) 1219 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1260 { 1220 return 1;
1261 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1262 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1263 &orig_map->tile_path[tile_num], &orig_map->path);
1264 mp = new maptile (1, 1);
1265 mp->alloc ();
1266 mp->in_memory = MAP_IN_MEMORY;
1267 }
1268 }
1269 1221
1270 int dest_tile = (tile_num + 2) % 4;
1271
1272 orig_map->tile_map [tile_num] = mp;
1273
1274 // optimisation: back-link map to origin map if euclidean
1275 //TODO: non-euclidean maps MUST GO
1276 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1277 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1278
1279 return mp; 1222 return 0;
1280}
1281
1282static inline void
1283load_and_link (maptile *orig_map, int tile_num)
1284{
1285 find_and_link (orig_map, tile_num)->load_sync ();
1286} 1223}
1287 1224
1288/* this returns TRUE if the coordinates (x,y) are out of 1225/* this returns TRUE if the coordinates (x,y) are out of
1289 * map m. This function also takes into account any 1226 * map m. This function also takes into account any
1290 * tiling considerations, loading adjacant maps as needed. 1227 * tiling considerations, loading adjacant maps as needed.
… …
1303 if (!m) 1240 if (!m)
1304 return 0; 1241 return 0;
1305 1242
1306 if (x < 0) 1243 if (x < 0)
1307 { 1244 {
1308 if (!m->tile_path[3]) 1245 if (!m->tile_available (3))
1309 return 1; 1246 return 1;
1310 1247
1311 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1312 find_and_link (m, 3);
1313
1314 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1248 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1315 } 1249 }
1316 1250
1317 if (x >= m->width) 1251 if (x >= m->width)
1318 { 1252 {
1319 if (!m->tile_path[1]) 1253 if (!m->tile_available (1))
1320 return 1; 1254 return 1;
1321 1255
1322 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1323 find_and_link (m, 1);
1324
1325 return out_of_map (m->tile_map[1], x - m->width, y); 1256 return out_of_map (m->tile_map[1], x - m->width, y);
1326 } 1257 }
1327 1258
1328 if (y < 0) 1259 if (y < 0)
1329 { 1260 {
1330 if (!m->tile_path[0]) 1261 if (!m->tile_available (0))
1331 return 1; 1262 return 1;
1332 1263
1333 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1334 find_and_link (m, 0);
1335
1336 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1264 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1337 } 1265 }
1338 1266
1339 if (y >= m->height) 1267 if (y >= m->height)
1340 { 1268 {
1341 if (!m->tile_path[2]) 1269 if (!m->tile_available (2))
1342 return 1; 1270 return 1;
1343
1344 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1345 find_and_link (m, 2);
1346 1271
1347 return out_of_map (m->tile_map[2], x, y - m->height); 1272 return out_of_map (m->tile_map[2], x, y - m->height);
1348 } 1273 }
1349 1274
1350 /* Simple case - coordinates are within this local 1275 /* Simple case - coordinates are within this local
… …
1364maptile * 1289maptile *
1365maptile::xy_find (sint16 &x, sint16 &y) 1290maptile::xy_find (sint16 &x, sint16 &y)
1366{ 1291{
1367 if (x < 0) 1292 if (x < 0)
1368 { 1293 {
1369 if (!tile_path[3]) 1294 if (!tile_available (3))
1370 return 0; 1295 return 0;
1371 1296
1372 find_and_link (this, 3);
1373 x += tile_map[3]->width; 1297 x += tile_map[3]->width;
1374 return tile_map[3]->xy_find (x, y); 1298 return tile_map[3]->xy_find (x, y);
1375 } 1299 }
1376 1300
1377 if (x >= width) 1301 if (x >= width)
1378 { 1302 {
1379 if (!tile_path[1]) 1303 if (!tile_available (1))
1380 return 0; 1304 return 0;
1381 1305
1382 find_and_link (this, 1);
1383 x -= width; 1306 x -= width;
1384 return tile_map[1]->xy_find (x, y); 1307 return tile_map[1]->xy_find (x, y);
1385 } 1308 }
1386 1309
1387 if (y < 0) 1310 if (y < 0)
1388 { 1311 {
1389 if (!tile_path[0]) 1312 if (!tile_available (0))
1390 return 0; 1313 return 0;
1391 1314
1392 find_and_link (this, 0);
1393 y += tile_map[0]->height; 1315 y += tile_map[0]->height;
1394 return tile_map[0]->xy_find (x, y); 1316 return tile_map[0]->xy_find (x, y);
1395 } 1317 }
1396 1318
1397 if (y >= height) 1319 if (y >= height)
1398 { 1320 {
1399 if (!tile_path[2]) 1321 if (!tile_available (2))
1400 return 0; 1322 return 0;
1401 1323
1402 find_and_link (this, 2);
1403 y -= height; 1324 y -= height;
1404 return tile_map[2]->xy_find (x, y); 1325 return tile_map[2]->xy_find (x, y);
1405 } 1326 }
1406 1327
1407 /* Simple case - coordinates are within this local 1328 /* Simple case - coordinates are within this local
… …
1418adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1339adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1419{ 1340{
1420 if (!map1 || !map2) 1341 if (!map1 || !map2)
1421 return 0; 1342 return 0;
1422 1343
1423 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1344 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1424 //fix: compare paths instead (this is likely faster, too!) 1345 //fix: compare paths instead (this is likely faster, too!)
1425 if (map1 == map2) 1346 if (map1 == map2)
1426 { 1347 {
1427 *dx = 0; 1348 *dx = 0;
1428 *dy = 0; 1349 *dy = 0;
… …
1682 1603
1683 // instead of crashing in the unlikely(?) case, try to return *something* 1604 // instead of crashing in the unlikely(?) case, try to return *something*
1684 return get_archetype ("blocked"); 1605 return get_archetype ("blocked");
1685} 1606}
1686 1607
1608void
1609maptile::play_sound (faceidx sound, int x, int y) const
1610{
1611 if (!sound)
1612 return;
1613
1614 for_all_players (pl)
1615 if (pl->observe->map == this)
1616 if (client *ns = pl->ns)
1617 {
1618 int dx = x - pl->observe->x;
1619 int dy = y - pl->observe->y;
1620
1621 int distance = idistance (dx, dy);
1622
1623 if (distance <= MAX_SOUND_DISTANCE)
1624 ns->play_sound (sound, dx, dy);
1625 }
1626}
1627

Diff Legend

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