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.100 by root, Tue Apr 17 10:06:32 2007 UTC vs.
Revision 1.127 by root, Fri Sep 7 18:03:31 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;
… …
353{ 289{
354 if (!spaces) 290 if (!spaces)
355 return; 291 return;
356 292
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 293 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 294 {
295 object *op = ms->bot;
296 while (op)
359 { 297 {
360 /* already multipart - don't do anything more */ 298 /* already multipart - don't do anything more */
361 if (!tmp->head && !tmp->more) 299 if (op->head_ () == op && !op->more && op->arch->more)
362 {
363 /* If there is nothing more to this object, this for loop
364 * won't do anything.
365 */
366 archetype *at;
367 object *last, *op;
368 for (at = tmp->arch->more, last = tmp;
369 at;
370 at = at->more, last = op)
371 { 300 {
372 op = arch_to_object (at); 301 op->remove ();
302 op->expand_tail ();
373 303
374 /* update x,y coordinates */ 304 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
375 op->x += tmp->x; 305 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
376 op->y += tmp->y; 306 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
377 op->head = tmp;
378 op->map = this;
379 last->more = op;
380 op->name = tmp->name;
381 op->title = tmp->title;
382
383 /* we could link all the parts onto tmp, and then just
384 * call insert_ob_in_map once, but the effect is the same,
385 * as insert_ob_in_map will call itself with each part, and
386 * the coding is simpler to just to it here with each part.
387 */
388 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
389 } 311 }
312 else
313 op = op->above;
390 } 314 }
391 } 315 }
392} 316}
393 317
394/* 318/*
395 * 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
396 * file pointer. 320 * file pointer.
… …
431} 355}
432 356
433void 357void
434maptile::activate () 358maptile::activate ()
435{ 359{
436 if (!spaces) 360 if (spaces)
437 return;
438
439 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 361 for (mapspace *ms = spaces + size (); ms-- > spaces; )
440 for (object *op = ms->bot; op; op = op->above) 362 for (object *op = ms->bot; op; op = op->above)
441 op->activate_recursive (); 363 op->activate_recursive ();
442} 364}
443 365
444void 366void
445maptile::deactivate () 367maptile::deactivate ()
446{ 368{
447 if (!spaces) 369 if (spaces)
448 return;
449
450 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
451 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
452 op->deactivate_recursive (); 372 op->deactivate_recursive ();
453} 373}
454 374
455bool 375bool
456maptile::_save_objects (object_freezer &f, int flags) 376maptile::_save_objects (object_freezer &f, int flags)
457{ 377{
… …
463 if (!spaces) 383 if (!spaces)
464 return false; 384 return false;
465 385
466 for (int i = 0; i < size (); ++i) 386 for (int i = 0; i < size (); ++i)
467 { 387 {
468 int unique = 0; 388 bool unique = 0;
389
469 for (object *op = spaces [i].bot; op; op = op->above) 390 for (object *op = spaces [i].bot; op; op = op->above)
470 { 391 {
471 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 392 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
472 unique = 1;
473 393
474 if (!op->can_map_save ()) 394 if (expect_false (!op->can_map_save ()))
475 continue; 395 continue;
476 396
477 if (unique || op->flag [FLAG_UNIQUE]) 397 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
478 { 398 {
479 if (flags & IO_UNIQUES) 399 if (flags & IO_UNIQUES)
480 op->write (f); 400 op->write (f);
481 } 401 }
482 else if (flags & IO_OBJECTS) 402 else if (expect_true (flags & IO_OBJECTS))
483 op->write (f); 403 op->write (f);
484 } 404 }
485 } 405 }
486 406
487 coroapi::cede_to_tick (); 407 coroapi::cede_to_tick ();
488 408
489 return true; 409 return true;
490}
491
492bool
493maptile::_load_objects (const char *path, bool skip_header)
494{
495 object_thawer f (path);
496
497 if (!f)
498 return false;
499
500 f.next ();
501
502 if (skip_header)
503 for (;;)
504 {
505 keyword kw = f.kw;
506 f.skip ();
507 if (kw == KW_end)
508 break;
509 }
510
511 return _load_objects (f);
512} 410}
513 411
514bool 412bool
515maptile::_save_objects (const char *path, int flags) 413maptile::_save_objects (const char *path, int flags)
516{ 414{
… …
691bool 589bool
692maptile::_load_header (object_thawer &thawer) 590maptile::_load_header (object_thawer &thawer)
693{ 591{
694 for (;;) 592 for (;;)
695 { 593 {
696 keyword kw = thawer.get_kv ();
697
698 switch (kw) 594 switch (thawer.kw)
699 { 595 {
700 case KW_msg: 596 case KW_msg:
701 thawer.get_ml (KW_endmsg, msg); 597 thawer.get_ml (KW_endmsg, msg);
702 break; 598 break;
703 599
… …
735 case KW_winddir: thawer.get (winddir); break; 631 case KW_winddir: thawer.get (winddir); break;
736 case KW_sky: thawer.get (sky); break; 632 case KW_sky: thawer.get (sky); break;
737 633
738 case KW_per_player: thawer.get (per_player); break; 634 case KW_per_player: thawer.get (per_player); break;
739 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;
740 637
741 case KW_region: default_region = region::find (thawer.get_str ()); break; 638 case KW_region: default_region = region::find (thawer.get_str ()); break;
742 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 639 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
743 640
744 // old names new names 641 // old names new names
… …
755 case KW_tile_path_1: thawer.get (tile_path [0]); break; 652 case KW_tile_path_1: thawer.get (tile_path [0]); break;
756 case KW_tile_path_2: thawer.get (tile_path [1]); break; 653 case KW_tile_path_2: thawer.get (tile_path [1]); break;
757 case KW_tile_path_3: thawer.get (tile_path [2]); break; 654 case KW_tile_path_3: thawer.get (tile_path [2]); break;
758 case KW_tile_path_4: thawer.get (tile_path [3]); break; 655 case KW_tile_path_4: thawer.get (tile_path [3]); break;
759 656
657 case KW_ERROR:
658 set_key_text (thawer.kw_str, thawer.value);
659 break;
660
760 case KW_end: 661 case KW_end:
662 thawer.next ();
761 return true; 663 return true;
762 664
763 default: 665 default:
764 if (!thawer.parse_error ("map", 0)) 666 if (!thawer.parse_error ("map", 0))
765 return false; 667 return false;
766 break; 668 break;
767 } 669 }
670
671 thawer.next ();
768 } 672 }
769 673
770 abort (); 674 abort ();
771}
772
773bool
774maptile::_load_header (const char *path)
775{
776 object_thawer thawer (path);
777
778 if (!thawer)
779 return false;
780
781 return _load_header (thawer);
782} 675}
783 676
784/****************************************************************************** 677/******************************************************************************
785 * This is the start of unique map handling code 678 * This is the start of unique map handling code
786 *****************************************************************************/ 679 *****************************************************************************/
… …
797 object *above = op->above; 690 object *above = op->above;
798 691
799 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))
800 unique = 1; 693 unique = 1;
801 694
802 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 695 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
803 { 696 {
804 op->destroy_inv (false); 697 op->destroy_inv (false);
805 op->destroy (); 698 op->destroy ();
806 } 699 }
807 700
… …
821 if (name) MAP_OUT (name); 714 if (name) MAP_OUT (name);
822 MAP_OUT (swap_time); 715 MAP_OUT (swap_time);
823 MAP_OUT (reset_time); 716 MAP_OUT (reset_time);
824 MAP_OUT (reset_timeout); 717 MAP_OUT (reset_timeout);
825 MAP_OUT (fixed_resettime); 718 MAP_OUT (fixed_resettime);
719 MAP_OUT (no_reset);
826 MAP_OUT (difficulty); 720 MAP_OUT (difficulty);
827 721
828 if (default_region) MAP_OUT2 (region, default_region->name); 722 if (default_region) MAP_OUT2 (region, default_region->name);
829 723
830 if (shopitems) 724 if (shopitems)
… …
884 * Remove and free all objects in the given map. 778 * Remove and free all objects in the given map.
885 */ 779 */
886void 780void
887maptile::clear () 781maptile::clear ()
888{ 782{
889 sfree (regions, size ()), regions = 0;
890 free (regionmap), regionmap = 0;
891
892 if (spaces) 783 if (spaces)
893 { 784 {
894 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 785 for (mapspace *ms = spaces + size (); ms-- > spaces; )
895 while (object *op = ms->bot) 786 while (object *op = ms->bot)
896 { 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
897 if (op->head) 794 if (op == op->head_ ())
898 op = op->head; 795 {
899
900 op->destroy_inv (false); 796 op->destroy_inv (false);
901 op->destroy (); 797 op->destroy ();
798 }
902 } 799 }
903 800
904 sfree (spaces, size ()), spaces = 0; 801 sfree (spaces, size ()), spaces = 0;
905 } 802 }
906 803
907 if (buttons) 804 if (buttons)
908 free_objectlinkpt (buttons), buttons = 0; 805 free_objectlinkpt (buttons), buttons = 0;
806
807 sfree (regions, size ()); regions = 0;
808 delete [] regionmap; regionmap = 0;
909} 809}
910 810
911void 811void
912maptile::clear_header () 812maptile::clear_header ()
913{ 813{
… …
943maptile::do_destroy () 843maptile::do_destroy ()
944{ 844{
945 attachable::do_destroy (); 845 attachable::do_destroy ();
946 846
947 clear (); 847 clear ();
848}
849
850/* decay and destroy perishable items in a map */
851void
852maptile::do_decay_objects ()
853{
854 if (!spaces)
855 return;
856
857 for (mapspace *ms = spaces + size (); ms-- > spaces; )
858 for (object *above, *op = ms->bot; op; op = above)
859 {
860 above = op->above;
861
862 bool destroy = 0;
863
864 // do not decay anything above unique floor tiles (yet :)
865 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
866 break;
867
868 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
869 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
870 || QUERY_FLAG (op, FLAG_UNIQUE)
871 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
872 || QUERY_FLAG (op, FLAG_UNPAID)
873 || op->is_alive ())
874 ; // do not decay
875 else if (op->is_weapon ())
876 {
877 op->stats.dam--;
878 if (op->stats.dam < 0)
879 destroy = 1;
880 }
881 else if (op->is_armor ())
882 {
883 op->stats.ac--;
884 if (op->stats.ac < 0)
885 destroy = 1;
886 }
887 else if (op->type == FOOD)
888 {
889 op->stats.food -= rndm (5, 20);
890 if (op->stats.food < 0)
891 destroy = 1;
892 }
893 else
894 {
895 int mat = op->materials;
896
897 if (mat & M_PAPER
898 || mat & M_LEATHER
899 || mat & M_WOOD
900 || mat & M_ORGANIC
901 || mat & M_CLOTH
902 || mat & M_LIQUID
903 || (mat & M_IRON && rndm (1, 5) == 1)
904 || (mat & M_GLASS && rndm (1, 2) == 1)
905 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
906 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
907 || (mat & M_ICE && temp > 32))
908 destroy = 1;
909 }
910
911 /* adjust overall chance below */
912 if (destroy && rndm (0, 1))
913 op->destroy ();
914 }
948} 915}
949 916
950/* 917/*
951 * Updates every button on the map (by calling update_button() for them). 918 * Updates every button on the map (by calling update_button() for them).
952 */ 919 */
… …
1000 if (QUERY_FLAG (op, FLAG_GENERATOR)) 967 if (QUERY_FLAG (op, FLAG_GENERATOR))
1001 { 968 {
1002 total_exp += op->stats.exp; 969 total_exp += op->stats.exp;
1003 970
1004 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 971 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1005 total_exp += at->clone.stats.exp * 8; 972 total_exp += at->stats.exp * 8;
1006 973
1007 monster_cnt++; 974 monster_cnt++;
1008 } 975 }
1009 } 976 }
1010 977
… …
1232 vol += op->volume (); 1199 vol += op->volume ();
1233 1200
1234 return vol; 1201 return vol;
1235} 1202}
1236 1203
1237/* this updates the orig_map->tile_map[tile_num] value after finding 1204bool
1238 * the map. It also takes care of linking back the freshly found 1205maptile::tile_available (int dir, bool load)
1239 * maps tile_map values if it tiles back to this one. It returns
1240 * the value of orig_map->tile_map[tile_num].
1241 */
1242static inline maptile *
1243find_and_link (maptile *orig_map, int tile_num)
1244{ 1206{
1245 maptile *mp = orig_map->tile_map [tile_num]; 1207 if (!tile_path[dir])
1208 return 0;
1246 1209
1247 if (!mp) 1210 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1248 { 1211 return 1;
1249 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1250 1212
1251 if (!mp) 1213 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1252 { 1214 return 1;
1253 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1254 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1255 &orig_map->tile_path[tile_num], &orig_map->path);
1256 mp = new maptile (1, 1);
1257 mp->alloc ();
1258 mp->in_memory = MAP_IN_MEMORY;
1259 }
1260 }
1261 1215
1262 int dest_tile = (tile_num + 2) % 4;
1263
1264 orig_map->tile_map [tile_num] = mp;
1265
1266 // optimisation: back-link map to origin map if euclidean
1267 //TODO: non-euclidean maps MUST GO
1268 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1269 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1270
1271 return mp; 1216 return 0;
1272}
1273
1274static inline void
1275load_and_link (maptile *orig_map, int tile_num)
1276{
1277 find_and_link (orig_map, tile_num)->load_sync ();
1278} 1217}
1279 1218
1280/* this returns TRUE if the coordinates (x,y) are out of 1219/* this returns TRUE if the coordinates (x,y) are out of
1281 * map m. This function also takes into account any 1220 * map m. This function also takes into account any
1282 * tiling considerations, loading adjacant maps as needed. 1221 * tiling considerations, loading adjacant maps as needed.
… …
1295 if (!m) 1234 if (!m)
1296 return 0; 1235 return 0;
1297 1236
1298 if (x < 0) 1237 if (x < 0)
1299 { 1238 {
1300 if (!m->tile_path[3]) 1239 if (!m->tile_available (3))
1301 return 1; 1240 return 1;
1302 1241
1303 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1304 find_and_link (m, 3);
1305
1306 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1242 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1307 } 1243 }
1308 1244
1309 if (x >= m->width) 1245 if (x >= m->width)
1310 { 1246 {
1311 if (!m->tile_path[1]) 1247 if (!m->tile_available (1))
1312 return 1; 1248 return 1;
1313 1249
1314 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1315 find_and_link (m, 1);
1316
1317 return out_of_map (m->tile_map[1], x - m->width, y); 1250 return out_of_map (m->tile_map[1], x - m->width, y);
1318 } 1251 }
1319 1252
1320 if (y < 0) 1253 if (y < 0)
1321 { 1254 {
1322 if (!m->tile_path[0]) 1255 if (!m->tile_available (0))
1323 return 1; 1256 return 1;
1324 1257
1325 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1326 find_and_link (m, 0);
1327
1328 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1258 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1329 } 1259 }
1330 1260
1331 if (y >= m->height) 1261 if (y >= m->height)
1332 { 1262 {
1333 if (!m->tile_path[2]) 1263 if (!m->tile_available (2))
1334 return 1; 1264 return 1;
1335
1336 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1337 find_and_link (m, 2);
1338 1265
1339 return out_of_map (m->tile_map[2], x, y - m->height); 1266 return out_of_map (m->tile_map[2], x, y - m->height);
1340 } 1267 }
1341 1268
1342 /* Simple case - coordinates are within this local 1269 /* Simple case - coordinates are within this local
… …
1356maptile * 1283maptile *
1357maptile::xy_find (sint16 &x, sint16 &y) 1284maptile::xy_find (sint16 &x, sint16 &y)
1358{ 1285{
1359 if (x < 0) 1286 if (x < 0)
1360 { 1287 {
1361 if (!tile_path[3]) 1288 if (!tile_available (3))
1362 return 0; 1289 return 0;
1363 1290
1364 find_and_link (this, 3);
1365 x += tile_map[3]->width; 1291 x += tile_map[3]->width;
1366 return tile_map[3]->xy_find (x, y); 1292 return tile_map[3]->xy_find (x, y);
1367 } 1293 }
1368 1294
1369 if (x >= width) 1295 if (x >= width)
1370 { 1296 {
1371 if (!tile_path[1]) 1297 if (!tile_available (1))
1372 return 0; 1298 return 0;
1373 1299
1374 find_and_link (this, 1);
1375 x -= width; 1300 x -= width;
1376 return tile_map[1]->xy_find (x, y); 1301 return tile_map[1]->xy_find (x, y);
1377 } 1302 }
1378 1303
1379 if (y < 0) 1304 if (y < 0)
1380 { 1305 {
1381 if (!tile_path[0]) 1306 if (!tile_available (0))
1382 return 0; 1307 return 0;
1383 1308
1384 find_and_link (this, 0);
1385 y += tile_map[0]->height; 1309 y += tile_map[0]->height;
1386 return tile_map[0]->xy_find (x, y); 1310 return tile_map[0]->xy_find (x, y);
1387 } 1311 }
1388 1312
1389 if (y >= height) 1313 if (y >= height)
1390 { 1314 {
1391 if (!tile_path[2]) 1315 if (!tile_available (2))
1392 return 0; 1316 return 0;
1393 1317
1394 find_and_link (this, 2);
1395 y -= height; 1318 y -= height;
1396 return tile_map[2]->xy_find (x, y); 1319 return tile_map[2]->xy_find (x, y);
1397 } 1320 }
1398 1321
1399 /* Simple case - coordinates are within this local 1322 /* Simple case - coordinates are within this local
… …
1410adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1333adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1411{ 1334{
1412 if (!map1 || !map2) 1335 if (!map1 || !map2)
1413 return 0; 1336 return 0;
1414 1337
1415 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1338 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1416 //fix: compare paths instead (this is likely faster, too!) 1339 //fix: compare paths instead (this is likely faster, too!)
1417 if (map1 == map2) 1340 if (map1 == map2)
1418 { 1341 {
1419 *dx = 0; 1342 *dx = 0;
1420 *dy = 0; 1343 *dy = 0;
… …
1674 1597
1675 // instead of crashing in the unlikely(?) case, try to return *something* 1598 // instead of crashing in the unlikely(?) case, try to return *something*
1676 return get_archetype ("blocked"); 1599 return get_archetype ("blocked");
1677} 1600}
1678 1601
1602void
1603maptile::play_sound (faceidx sound, int x, int y) const
1604{
1605 if (!sound)
1606 return;
1607
1608 for_all_players (pl)
1609 if (pl->observe->map == this)
1610 if (client *ns = pl->ns)
1611 {
1612 int dx = x - pl->observe->x;
1613 int dy = y - pl->observe->y;
1614
1615 int distance = idistance (dx, dy);
1616
1617 if (distance <= MAX_SOUND_DISTANCE)
1618 ns->play_sound (sound, dx, dy);
1619 }
1620}
1621

Diff Legend

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