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.102 by root, Thu May 17 21:32:08 2007 UTC vs.
Revision 1.129 by root, Wed Sep 12 11:10:09 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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
… …
220 * hidden dm 153 * hidden dm
221 */ 154 */
222 if (OB_MOVE_BLOCK (ob, tmp)) 155 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1; 156 return 1;
224 157
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) 158 if (tmp->flag [FLAG_ALIVE]
226 && tmp->head_ () != ob 159 && tmp->head_ () != ob
227 && tmp != ob 160 && tmp != ob
228 && tmp->type != DOOR 161 && tmp->type != DOOR
229 && !tmp->flag [FLAG_WIZ] 162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
230 && tmp->contr->hidden)
231 return 1; 163 return 1;
232 } 164 }
233 165
234 } 166 }
235 return 0; 167 return 0;
236} 168}
237 169
238/* 170/*
239 * Returns true if the given object can't fit in the given spot. 171 * Returns qthe blocking object if the given object can't fit in the given
240 * This is meant for multi space objects - for single space objecs, 172 * spot. This is meant for multi space objects - for single space objecs,
241 * just calling get_map_blocked and checking that against movement type 173 * just calling get_map_blocked and checking that against movement type
242 * of object. This function goes through all the parts of the 174 * of object. This function goes through all the parts of the multipart
243 * multipart object and makes sure they can be inserted. 175 * object and makes sure they can be inserted.
244 * 176 *
245 * While this doesn't call out of map, the get_map_flags does. 177 * While this doesn't call out of map, the get_map_flags does.
246 * 178 *
247 * This function has been used to deprecate arch_out_of_map - 179 * This function has been used to deprecate arch_out_of_map -
248 * this function also does that check, and since in most cases, 180 * this function also does that check, and since in most cases,
… …
259 * 191 *
260 * Note this used to be arch_blocked, but with new movement 192 * Note this used to be arch_blocked, but with new movement
261 * code, we need to have actual object to check its move_type 193 * code, we need to have actual object to check its move_type
262 * against the move_block values. 194 * against the move_block values.
263 */ 195 */
264int 196bool
265ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 197object::blocked (maptile *m, int x, int y) const
266{ 198{
267 archetype *tmp; 199 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
268 int flag;
269 maptile *m1;
270 sint16 sx, sy;
271
272 if (!ob)
273 {
274 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
275 if (flag & P_OUT_OF_MAP)
276 return P_OUT_OF_MAP;
277
278 /* don't have object, so don't know what types would block */
279 return m1->at (sx, sy).move_block;
280 } 200 {
201 mapxy pos (m, x + tmp->x, y + tmp->y);
281 202
282 for (tmp = ob->arch; tmp; tmp = tmp->more) 203 if (!pos.normalise ())
283 { 204 return 1;
284 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
285 205
286 if (flag & P_OUT_OF_MAP) 206 mapspace &ms = *pos;
287 return P_OUT_OF_MAP; 207
288 if (flag & P_IS_ALIVE) 208 if (ms.flags () & P_IS_ALIVE)
289 return P_IS_ALIVE; 209 return 1;
290 210
291 mapspace &ms = m1->at (sx, sy); 211 /* However, often ob doesn't have any move type
292 212 * (signifying non-moving objects)
293 /* find_first_free_spot() calls this function. However, often
294 * ob doesn't have any move type (when used to place exits)
295 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 213 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
296 */ 214 */
297
298 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 215 if (!move_type && ms.move_block != MOVE_ALL)
299 continue; 216 continue;
300 217
301 /* Note it is intentional that we check ob - the movement type of the 218 /* Note it is intentional that we check ob - the movement type of the
302 * head of the object should correspond for the entire object. 219 * head of the object should correspond for the entire object.
303 */ 220 */
304 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 221 if (ms.blocks (move_type))
305 return P_NO_PASS; 222 return 1;
306 } 223 }
307 224
308 return 0; 225 return 0;
309} 226}
310 227
… …
357{ 274{
358 if (!spaces) 275 if (!spaces)
359 return; 276 return;
360 277
361 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 278 for (mapspace *ms = spaces + size (); ms-- > spaces; )
362 for (object *op = ms->bot; op; op = op->above) 279 {
280 object *op = ms->bot;
281 while (op)
363 { 282 {
364 /* already multipart - don't do anything more */ 283 /* already multipart - don't do anything more */
365 if (op->head_ () == op && !op->more && op->arch->more) 284 if (op->head_ () == op && !op->more && op->arch->more)
366 { 285 {
367 op->remove (); 286 op->remove ();
368 op->expand_tail (); 287 op->expand_tail ();
288
289 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
290 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
291 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
369 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 292 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
293
294 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
295 // so we have to reset the iteration through the mapspace
370 } 296 }
297 else
298 op = op->above;
371 } 299 }
300 }
372} 301}
373 302
374/* 303/*
375 * Loads (ands parses) the objects into a given map from the specified 304 * Loads (ands parses) the objects into a given map from the specified
376 * file pointer. 305 * file pointer.
… …
411} 340}
412 341
413void 342void
414maptile::activate () 343maptile::activate ()
415{ 344{
416 active = true;
417
418 if (spaces) 345 if (spaces)
419 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 346 for (mapspace *ms = spaces + size (); ms-- > spaces; )
420 for (object *op = ms->bot; op; op = op->above) 347 for (object *op = ms->bot; op; op = op->above)
421 op->activate_recursive (); 348 op->activate_recursive ();
422} 349}
423 350
424void 351void
425maptile::deactivate () 352maptile::deactivate ()
426{ 353{
427 active = false;
428
429 if (spaces) 354 if (spaces)
430 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 355 for (mapspace *ms = spaces + size (); ms-- > spaces; )
431 for (object *op = ms->bot; op; op = op->above) 356 for (object *op = ms->bot; op; op = op->above)
432 op->deactivate_recursive (); 357 op->deactivate_recursive ();
433} 358}
… …
443 if (!spaces) 368 if (!spaces)
444 return false; 369 return false;
445 370
446 for (int i = 0; i < size (); ++i) 371 for (int i = 0; i < size (); ++i)
447 { 372 {
448 int unique = 0; 373 bool unique = 0;
374
449 for (object *op = spaces [i].bot; op; op = op->above) 375 for (object *op = spaces [i].bot; op; op = op->above)
450 { 376 {
451 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 377 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
452 unique = 1;
453 378
454 if (!op->can_map_save ()) 379 if (expect_false (!op->can_map_save ()))
455 continue; 380 continue;
456 381
457 if (unique || op->flag [FLAG_UNIQUE]) 382 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
458 { 383 {
459 if (flags & IO_UNIQUES) 384 if (flags & IO_UNIQUES)
460 op->write (f); 385 op->write (f);
461 } 386 }
462 else if (flags & IO_OBJECTS) 387 else if (expect_true (flags & IO_OBJECTS))
463 op->write (f); 388 op->write (f);
464 } 389 }
465 } 390 }
466 391
467 coroapi::cede_to_tick (); 392 coroapi::cede_to_tick ();
468 393
469 return true; 394 return true;
470}
471
472bool
473maptile::_load_objects (const char *path, bool skip_header)
474{
475 object_thawer f (path);
476
477 if (!f)
478 return false;
479
480 f.next ();
481
482 if (skip_header)
483 for (;;)
484 {
485 keyword kw = f.kw;
486 f.skip ();
487 if (kw == KW_end)
488 break;
489 }
490
491 return _load_objects (f);
492} 395}
493 396
494bool 397bool
495maptile::_save_objects (const char *path, int flags) 398maptile::_save_objects (const char *path, int flags)
496{ 399{
… …
671bool 574bool
672maptile::_load_header (object_thawer &thawer) 575maptile::_load_header (object_thawer &thawer)
673{ 576{
674 for (;;) 577 for (;;)
675 { 578 {
676 keyword kw = thawer.get_kv ();
677
678 switch (kw) 579 switch (thawer.kw)
679 { 580 {
680 case KW_msg: 581 case KW_msg:
681 thawer.get_ml (KW_endmsg, msg); 582 thawer.get_ml (KW_endmsg, msg);
682 break; 583 break;
683 584
… …
715 case KW_winddir: thawer.get (winddir); break; 616 case KW_winddir: thawer.get (winddir); break;
716 case KW_sky: thawer.get (sky); break; 617 case KW_sky: thawer.get (sky); break;
717 618
718 case KW_per_player: thawer.get (per_player); break; 619 case KW_per_player: thawer.get (per_player); break;
719 case KW_per_party: thawer.get (per_party); break; 620 case KW_per_party: thawer.get (per_party); break;
621 case KW_no_reset: thawer.get (no_reset); break;
720 622
721 case KW_region: default_region = region::find (thawer.get_str ()); break; 623 case KW_region: default_region = region::find (thawer.get_str ()); break;
722 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 624 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
723 625
724 // old names new names 626 // old names new names
… …
735 case KW_tile_path_1: thawer.get (tile_path [0]); break; 637 case KW_tile_path_1: thawer.get (tile_path [0]); break;
736 case KW_tile_path_2: thawer.get (tile_path [1]); break; 638 case KW_tile_path_2: thawer.get (tile_path [1]); break;
737 case KW_tile_path_3: thawer.get (tile_path [2]); break; 639 case KW_tile_path_3: thawer.get (tile_path [2]); break;
738 case KW_tile_path_4: thawer.get (tile_path [3]); break; 640 case KW_tile_path_4: thawer.get (tile_path [3]); break;
739 641
642 case KW_ERROR:
643 set_key_text (thawer.kw_str, thawer.value);
644 break;
645
740 case KW_end: 646 case KW_end:
647 thawer.next ();
741 return true; 648 return true;
742 649
743 default: 650 default:
744 if (!thawer.parse_error ("map", 0)) 651 if (!thawer.parse_error ("map", 0))
745 return false; 652 return false;
746 break; 653 break;
747 } 654 }
655
656 thawer.next ();
748 } 657 }
749 658
750 abort (); 659 abort ();
751}
752
753bool
754maptile::_load_header (const char *path)
755{
756 object_thawer thawer (path);
757
758 if (!thawer)
759 return false;
760
761 return _load_header (thawer);
762} 660}
763 661
764/****************************************************************************** 662/******************************************************************************
765 * This is the start of unique map handling code 663 * This is the start of unique map handling code
766 *****************************************************************************/ 664 *****************************************************************************/
… …
801 if (name) MAP_OUT (name); 699 if (name) MAP_OUT (name);
802 MAP_OUT (swap_time); 700 MAP_OUT (swap_time);
803 MAP_OUT (reset_time); 701 MAP_OUT (reset_time);
804 MAP_OUT (reset_timeout); 702 MAP_OUT (reset_timeout);
805 MAP_OUT (fixed_resettime); 703 MAP_OUT (fixed_resettime);
704 MAP_OUT (no_reset);
806 MAP_OUT (difficulty); 705 MAP_OUT (difficulty);
807 706
808 if (default_region) MAP_OUT2 (region, default_region->name); 707 if (default_region) MAP_OUT2 (region, default_region->name);
809 708
810 if (shopitems) 709 if (shopitems)
… …
864 * Remove and free all objects in the given map. 763 * Remove and free all objects in the given map.
865 */ 764 */
866void 765void
867maptile::clear () 766maptile::clear ()
868{ 767{
869 sfree (regions, size ()), regions = 0;
870 free (regionmap), regionmap = 0;
871
872 if (spaces) 768 if (spaces)
873 { 769 {
874 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 770 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 while (object *op = ms->bot->head_ ()) 771 while (object *op = ms->bot)
876 { 772 {
773 // manually remove, as to not trigger anything
774 if (ms->bot = op->above)
775 ms->bot->below = 0;
776
777 op->flag [FLAG_REMOVED] = true;
778
779 object *head = op->head_ ();
780 if (op == head)
781 {
877 op->destroy_inv (false); 782 op->destroy_inv (false);
878 op->destroy (); 783 op->destroy ();
784 }
785 else if (head->map != op->map)
786 {
787 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
788 head->destroy ();
789 }
879 } 790 }
880 791
881 sfree (spaces, size ()), spaces = 0; 792 sfree (spaces, size ()), spaces = 0;
882 } 793 }
883 794
884 if (buttons) 795 if (buttons)
885 free_objectlinkpt (buttons), buttons = 0; 796 free_objectlinkpt (buttons), buttons = 0;
797
798 sfree (regions, size ()); regions = 0;
799 delete [] regionmap; regionmap = 0;
886} 800}
887 801
888void 802void
889maptile::clear_header () 803maptile::clear_header ()
890{ 804{
… …
920maptile::do_destroy () 834maptile::do_destroy ()
921{ 835{
922 attachable::do_destroy (); 836 attachable::do_destroy ();
923 837
924 clear (); 838 clear ();
839}
840
841/* decay and destroy perishable items in a map */
842void
843maptile::do_decay_objects ()
844{
845 if (!spaces)
846 return;
847
848 for (mapspace *ms = spaces + size (); ms-- > spaces; )
849 for (object *above, *op = ms->bot; op; op = above)
850 {
851 above = op->above;
852
853 bool destroy = 0;
854
855 // do not decay anything above unique floor tiles (yet :)
856 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
857 break;
858
859 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
860 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
861 || QUERY_FLAG (op, FLAG_UNIQUE)
862 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
863 || QUERY_FLAG (op, FLAG_UNPAID)
864 || op->is_alive ())
865 ; // do not decay
866 else if (op->is_weapon ())
867 {
868 op->stats.dam--;
869 if (op->stats.dam < 0)
870 destroy = 1;
871 }
872 else if (op->is_armor ())
873 {
874 op->stats.ac--;
875 if (op->stats.ac < 0)
876 destroy = 1;
877 }
878 else if (op->type == FOOD)
879 {
880 op->stats.food -= rndm (5, 20);
881 if (op->stats.food < 0)
882 destroy = 1;
883 }
884 else
885 {
886 int mat = op->materials;
887
888 if (mat & M_PAPER
889 || mat & M_LEATHER
890 || mat & M_WOOD
891 || mat & M_ORGANIC
892 || mat & M_CLOTH
893 || mat & M_LIQUID
894 || (mat & M_IRON && rndm (1, 5) == 1)
895 || (mat & M_GLASS && rndm (1, 2) == 1)
896 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
897 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
898 || (mat & M_ICE && temp > 32))
899 destroy = 1;
900 }
901
902 /* adjust overall chance below */
903 if (destroy && rndm (0, 1))
904 op->destroy ();
905 }
925} 906}
926 907
927/* 908/*
928 * Updates every button on the map (by calling update_button() for them). 909 * Updates every button on the map (by calling update_button() for them).
929 */ 910 */
… …
977 if (QUERY_FLAG (op, FLAG_GENERATOR)) 958 if (QUERY_FLAG (op, FLAG_GENERATOR))
978 { 959 {
979 total_exp += op->stats.exp; 960 total_exp += op->stats.exp;
980 961
981 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 962 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
982 total_exp += at->clone.stats.exp * 8; 963 total_exp += at->stats.exp * 8;
983 964
984 monster_cnt++; 965 monster_cnt++;
985 } 966 }
986 } 967 }
987 968
… …
1209 vol += op->volume (); 1190 vol += op->volume ();
1210 1191
1211 return vol; 1192 return vol;
1212} 1193}
1213 1194
1214/* this updates the orig_map->tile_map[tile_num] value after finding 1195bool
1215 * the map. It also takes care of linking back the freshly found 1196maptile::tile_available (int dir, bool load)
1216 * maps tile_map values if it tiles back to this one. It returns
1217 * the value of orig_map->tile_map[tile_num].
1218 */
1219static inline maptile *
1220find_and_link (maptile *orig_map, int tile_num)
1221{ 1197{
1222 maptile *mp = orig_map->tile_map [tile_num]; 1198 if (!tile_path[dir])
1199 return 0;
1223 1200
1224 if (!mp) 1201 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1225 { 1202 return 1;
1226 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1227 1203
1228 if (!mp) 1204 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1229 { 1205 return 1;
1230 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1231 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1232 &orig_map->tile_path[tile_num], &orig_map->path);
1233 mp = new maptile (1, 1);
1234 mp->alloc ();
1235 mp->in_memory = MAP_IN_MEMORY;
1236 }
1237 }
1238 1206
1239 int dest_tile = (tile_num + 2) % 4;
1240
1241 orig_map->tile_map [tile_num] = mp;
1242
1243 // optimisation: back-link map to origin map if euclidean
1244 //TODO: non-euclidean maps MUST GO
1245 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1246 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1247
1248 return mp; 1207 return 0;
1249}
1250
1251static inline void
1252load_and_link (maptile *orig_map, int tile_num)
1253{
1254 find_and_link (orig_map, tile_num)->load_sync ();
1255} 1208}
1256 1209
1257/* this returns TRUE if the coordinates (x,y) are out of 1210/* this returns TRUE if the coordinates (x,y) are out of
1258 * map m. This function also takes into account any 1211 * map m. This function also takes into account any
1259 * tiling considerations, loading adjacant maps as needed. 1212 * tiling considerations, loading adjacant maps as needed.
… …
1272 if (!m) 1225 if (!m)
1273 return 0; 1226 return 0;
1274 1227
1275 if (x < 0) 1228 if (x < 0)
1276 { 1229 {
1277 if (!m->tile_path[3]) 1230 if (!m->tile_available (3))
1278 return 1; 1231 return 1;
1279 1232
1280 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1281 find_and_link (m, 3);
1282
1283 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1233 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1284 } 1234 }
1285 1235
1286 if (x >= m->width) 1236 if (x >= m->width)
1287 { 1237 {
1288 if (!m->tile_path[1]) 1238 if (!m->tile_available (1))
1289 return 1; 1239 return 1;
1290 1240
1291 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1292 find_and_link (m, 1);
1293
1294 return out_of_map (m->tile_map[1], x - m->width, y); 1241 return out_of_map (m->tile_map[1], x - m->width, y);
1295 } 1242 }
1296 1243
1297 if (y < 0) 1244 if (y < 0)
1298 { 1245 {
1299 if (!m->tile_path[0]) 1246 if (!m->tile_available (0))
1300 return 1; 1247 return 1;
1301 1248
1302 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1303 find_and_link (m, 0);
1304
1305 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1249 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1306 } 1250 }
1307 1251
1308 if (y >= m->height) 1252 if (y >= m->height)
1309 { 1253 {
1310 if (!m->tile_path[2]) 1254 if (!m->tile_available (2))
1311 return 1; 1255 return 1;
1312
1313 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1314 find_and_link (m, 2);
1315 1256
1316 return out_of_map (m->tile_map[2], x, y - m->height); 1257 return out_of_map (m->tile_map[2], x, y - m->height);
1317 } 1258 }
1318 1259
1319 /* Simple case - coordinates are within this local 1260 /* Simple case - coordinates are within this local
… …
1333maptile * 1274maptile *
1334maptile::xy_find (sint16 &x, sint16 &y) 1275maptile::xy_find (sint16 &x, sint16 &y)
1335{ 1276{
1336 if (x < 0) 1277 if (x < 0)
1337 { 1278 {
1338 if (!tile_path[3]) 1279 if (!tile_available (3))
1339 return 0; 1280 return 0;
1340 1281
1341 find_and_link (this, 3);
1342 x += tile_map[3]->width; 1282 x += tile_map[3]->width;
1343 return tile_map[3]->xy_find (x, y); 1283 return tile_map[3]->xy_find (x, y);
1344 } 1284 }
1345 1285
1346 if (x >= width) 1286 if (x >= width)
1347 { 1287 {
1348 if (!tile_path[1]) 1288 if (!tile_available (1))
1349 return 0; 1289 return 0;
1350 1290
1351 find_and_link (this, 1);
1352 x -= width; 1291 x -= width;
1353 return tile_map[1]->xy_find (x, y); 1292 return tile_map[1]->xy_find (x, y);
1354 } 1293 }
1355 1294
1356 if (y < 0) 1295 if (y < 0)
1357 { 1296 {
1358 if (!tile_path[0]) 1297 if (!tile_available (0))
1359 return 0; 1298 return 0;
1360 1299
1361 find_and_link (this, 0);
1362 y += tile_map[0]->height; 1300 y += tile_map[0]->height;
1363 return tile_map[0]->xy_find (x, y); 1301 return tile_map[0]->xy_find (x, y);
1364 } 1302 }
1365 1303
1366 if (y >= height) 1304 if (y >= height)
1367 { 1305 {
1368 if (!tile_path[2]) 1306 if (!tile_available (2))
1369 return 0; 1307 return 0;
1370 1308
1371 find_and_link (this, 2);
1372 y -= height; 1309 y -= height;
1373 return tile_map[2]->xy_find (x, y); 1310 return tile_map[2]->xy_find (x, y);
1374 } 1311 }
1375 1312
1376 /* Simple case - coordinates are within this local 1313 /* Simple case - coordinates are within this local
… …
1387adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1324adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1388{ 1325{
1389 if (!map1 || !map2) 1326 if (!map1 || !map2)
1390 return 0; 1327 return 0;
1391 1328
1392 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1329 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1393 //fix: compare paths instead (this is likely faster, too!) 1330 //fix: compare paths instead (this is likely faster, too!)
1394 if (map1 == map2) 1331 if (map1 == map2)
1395 { 1332 {
1396 *dx = 0; 1333 *dx = 0;
1397 *dy = 0; 1334 *dy = 0;
… …
1651 1588
1652 // instead of crashing in the unlikely(?) case, try to return *something* 1589 // instead of crashing in the unlikely(?) case, try to return *something*
1653 return get_archetype ("blocked"); 1590 return get_archetype ("blocked");
1654} 1591}
1655 1592
1593void
1594maptile::play_sound (faceidx sound, int x, int y) const
1595{
1596 if (!sound)
1597 return;
1598
1599 for_all_players (pl)
1600 if (pl->observe->map == this)
1601 if (client *ns = pl->ns)
1602 {
1603 int dx = x - pl->observe->x;
1604 int dy = y - pl->observe->y;
1605
1606 int distance = idistance (dx, dy);
1607
1608 if (distance <= MAX_SOUND_DISTANCE)
1609 ns->play_sound (sound, dx, dy);
1610 }
1611}
1612

Diff Legend

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