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.99 by root, Mon Apr 16 06:23:39 2007 UTC vs.
Revision 1.129 by root, Wed Sep 12 11:10:09 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;
232} 168}
233 169
234/* 170/*
235 * 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
236 * This is meant for multi space objects - for single space objecs, 172 * spot. This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 173 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 174 * of object. This function goes through all the parts of the multipart
239 * multipart object and makes sure they can be inserted. 175 * object and makes sure they can be inserted.
240 * 176 *
241 * 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.
242 * 178 *
243 * This function has been used to deprecate arch_out_of_map - 179 * This function has been used to deprecate arch_out_of_map -
244 * this function also does that check, and since in most cases, 180 * this function also does that check, and since in most cases,
… …
255 * 191 *
256 * Note this used to be arch_blocked, but with new movement 192 * Note this used to be arch_blocked, but with new movement
257 * 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
258 * against the move_block values. 194 * against the move_block values.
259 */ 195 */
260int 196bool
261ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 197object::blocked (maptile *m, int x, int y) const
262{ 198{
263 archetype *tmp; 199 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
264 int flag;
265 maptile *m1;
266 sint16 sx, sy;
267
268 if (!ob)
269 {
270 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
271 if (flag & P_OUT_OF_MAP)
272 return P_OUT_OF_MAP;
273
274 /* don't have object, so don't know what types would block */
275 return m1->at (sx, sy).move_block;
276 } 200 {
201 mapxy pos (m, x + tmp->x, y + tmp->y);
277 202
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 203 if (!pos.normalise ())
279 { 204 return 1;
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281 205
282 if (flag & P_OUT_OF_MAP) 206 mapspace &ms = *pos;
283 return P_OUT_OF_MAP; 207
284 if (flag & P_IS_ALIVE) 208 if (ms.flags () & P_IS_ALIVE)
285 return P_IS_ALIVE; 209 return 1;
286 210
287 mapspace &ms = m1->at (sx, sy); 211 /* However, often ob doesn't have any move type
288 212 * (signifying non-moving objects)
289 /* find_first_free_spot() calls this function. However, often
290 * ob doesn't have any move type (when used to place exits)
291 * 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.
292 */ 214 */
293
294 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 215 if (!move_type && ms.move_block != MOVE_ALL)
295 continue; 216 continue;
296 217
297 /* 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
298 * head of the object should correspond for the entire object. 219 * head of the object should correspond for the entire object.
299 */ 220 */
300 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 221 if (ms.blocks (move_type))
301 return P_NO_PASS; 222 return 1;
302 } 223 }
303 224
304 return 0; 225 return 0;
305} 226}
306 227
… …
353{ 274{
354 if (!spaces) 275 if (!spaces)
355 return; 276 return;
356 277
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 278 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 279 {
280 object *op = ms->bot;
281 while (op)
359 { 282 {
360 /* already multipart - don't do anything more */ 283 /* already multipart - don't do anything more */
361 if (!tmp->head && !tmp->more) 284 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 { 285 {
372 op = arch_to_object (at); 286 op->remove ();
287 op->expand_tail ();
373 288
374 /* update x,y coordinates */ 289 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
375 op->x += tmp->x; 290 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
376 op->y += tmp->y; 291 // 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); 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
389 } 296 }
297 else
298 op = op->above;
390 } 299 }
391 } 300 }
392} 301}
393 302
394/* 303/*
395 * 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
396 * file pointer. 305 * file pointer.
… …
398bool 307bool
399maptile::_load_objects (object_thawer &f) 308maptile::_load_objects (object_thawer &f)
400{ 309{
401 for (;;) 310 for (;;)
402 { 311 {
403 coroapi::cede_every (1000); // cede once in a while 312 coroapi::cede_to_tick_every (100); // cede once in a while
404 313
405 switch (f.kw) 314 switch (f.kw)
406 { 315 {
407 case KW_arch: 316 case KW_arch:
408 if (object *op = object::read (f, this)) 317 if (object *op = object::read (f, this))
… …
431} 340}
432 341
433void 342void
434maptile::activate () 343maptile::activate ()
435{ 344{
436 if (!spaces) 345 if (spaces)
437 return;
438
439 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 346 for (mapspace *ms = spaces + size (); ms-- > spaces; )
440 for (object *op = ms->bot; op; op = op->above) 347 for (object *op = ms->bot; op; op = op->above)
441 op->activate_recursive (); 348 op->activate_recursive ();
442} 349}
443 350
444void 351void
445maptile::deactivate () 352maptile::deactivate ()
446{ 353{
447 if (!spaces) 354 if (spaces)
448 return;
449
450 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 355 for (mapspace *ms = spaces + size (); ms-- > spaces; )
451 for (object *op = ms->bot; op; op = op->above) 356 for (object *op = ms->bot; op; op = op->above)
452 op->deactivate_recursive (); 357 op->deactivate_recursive ();
453} 358}
454 359
455bool 360bool
456maptile::_save_objects (object_freezer &f, int flags) 361maptile::_save_objects (object_freezer &f, int flags)
457{ 362{
458 coroapi::cede (); 363 coroapi::cede_to_tick ();
459 364
460 if (flags & IO_HEADER) 365 if (flags & IO_HEADER)
461 _save_header (f); 366 _save_header (f);
462 367
463 if (!spaces) 368 if (!spaces)
464 return false; 369 return false;
465 370
466 for (int i = 0; i < size (); ++i) 371 for (int i = 0; i < size (); ++i)
467 { 372 {
468 int unique = 0; 373 bool unique = 0;
374
469 for (object *op = spaces [i].bot; op; op = op->above) 375 for (object *op = spaces [i].bot; op; op = op->above)
470 { 376 {
471 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 377 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
472 unique = 1;
473 378
474 if (!op->can_map_save ()) 379 if (expect_false (!op->can_map_save ()))
475 continue; 380 continue;
476 381
477 if (unique || op->flag [FLAG_UNIQUE]) 382 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
478 { 383 {
479 if (flags & IO_UNIQUES) 384 if (flags & IO_UNIQUES)
480 op->write (f); 385 op->write (f);
481 } 386 }
482 else if (flags & IO_OBJECTS) 387 else if (expect_true (flags & IO_OBJECTS))
483 op->write (f); 388 op->write (f);
484 } 389 }
485 } 390 }
486 391
487 coroapi::cede (); 392 coroapi::cede_to_tick ();
488 393
489 return true; 394 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} 395}
513 396
514bool 397bool
515maptile::_save_objects (const char *path, int flags) 398maptile::_save_objects (const char *path, int flags)
516{ 399{
… …
691bool 574bool
692maptile::_load_header (object_thawer &thawer) 575maptile::_load_header (object_thawer &thawer)
693{ 576{
694 for (;;) 577 for (;;)
695 { 578 {
696 keyword kw = thawer.get_kv ();
697
698 switch (kw) 579 switch (thawer.kw)
699 { 580 {
700 case KW_msg: 581 case KW_msg:
701 thawer.get_ml (KW_endmsg, msg); 582 thawer.get_ml (KW_endmsg, msg);
702 break; 583 break;
703 584
… …
735 case KW_winddir: thawer.get (winddir); break; 616 case KW_winddir: thawer.get (winddir); break;
736 case KW_sky: thawer.get (sky); break; 617 case KW_sky: thawer.get (sky); break;
737 618
738 case KW_per_player: thawer.get (per_player); break; 619 case KW_per_player: thawer.get (per_player); break;
739 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;
740 622
741 case KW_region: default_region = region::find (thawer.get_str ()); break; 623 case KW_region: default_region = region::find (thawer.get_str ()); break;
742 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 624 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
743 625
744 // old names new names 626 // old names new names
… …
755 case KW_tile_path_1: thawer.get (tile_path [0]); break; 637 case KW_tile_path_1: thawer.get (tile_path [0]); break;
756 case KW_tile_path_2: thawer.get (tile_path [1]); break; 638 case KW_tile_path_2: thawer.get (tile_path [1]); break;
757 case KW_tile_path_3: thawer.get (tile_path [2]); break; 639 case KW_tile_path_3: thawer.get (tile_path [2]); break;
758 case KW_tile_path_4: thawer.get (tile_path [3]); break; 640 case KW_tile_path_4: thawer.get (tile_path [3]); break;
759 641
642 case KW_ERROR:
643 set_key_text (thawer.kw_str, thawer.value);
644 break;
645
760 case KW_end: 646 case KW_end:
647 thawer.next ();
761 return true; 648 return true;
762 649
763 default: 650 default:
764 if (!thawer.parse_error ("map", 0)) 651 if (!thawer.parse_error ("map", 0))
765 return false; 652 return false;
766 break; 653 break;
767 } 654 }
655
656 thawer.next ();
768 } 657 }
769 658
770 abort (); 659 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} 660}
783 661
784/****************************************************************************** 662/******************************************************************************
785 * This is the start of unique map handling code 663 * This is the start of unique map handling code
786 *****************************************************************************/ 664 *****************************************************************************/
… …
797 object *above = op->above; 675 object *above = op->above;
798 676
799 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 677 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
800 unique = 1; 678 unique = 1;
801 679
802 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 680 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
803 { 681 {
804 op->destroy_inv (false); 682 op->destroy_inv (false);
805 op->destroy (); 683 op->destroy ();
806 } 684 }
807 685
… …
821 if (name) MAP_OUT (name); 699 if (name) MAP_OUT (name);
822 MAP_OUT (swap_time); 700 MAP_OUT (swap_time);
823 MAP_OUT (reset_time); 701 MAP_OUT (reset_time);
824 MAP_OUT (reset_timeout); 702 MAP_OUT (reset_timeout);
825 MAP_OUT (fixed_resettime); 703 MAP_OUT (fixed_resettime);
704 MAP_OUT (no_reset);
826 MAP_OUT (difficulty); 705 MAP_OUT (difficulty);
827 706
828 if (default_region) MAP_OUT2 (region, default_region->name); 707 if (default_region) MAP_OUT2 (region, default_region->name);
829 708
830 if (shopitems) 709 if (shopitems)
… …
884 * Remove and free all objects in the given map. 763 * Remove and free all objects in the given map.
885 */ 764 */
886void 765void
887maptile::clear () 766maptile::clear ()
888{ 767{
889 sfree (regions, size ()), regions = 0;
890 free (regionmap), regionmap = 0;
891
892 if (spaces) 768 if (spaces)
893 { 769 {
894 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 770 for (mapspace *ms = spaces + size (); ms-- > spaces; )
895 while (object *op = ms->bot) 771 while (object *op = ms->bot)
896 { 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_ ();
897 if (op->head) 780 if (op == head)
898 op = op->head; 781 {
899
900 op->destroy_inv (false); 782 op->destroy_inv (false);
901 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 }
902 } 790 }
903 791
904 sfree (spaces, size ()), spaces = 0; 792 sfree (spaces, size ()), spaces = 0;
905 } 793 }
906 794
907 if (buttons) 795 if (buttons)
908 free_objectlinkpt (buttons), buttons = 0; 796 free_objectlinkpt (buttons), buttons = 0;
797
798 sfree (regions, size ()); regions = 0;
799 delete [] regionmap; regionmap = 0;
909} 800}
910 801
911void 802void
912maptile::clear_header () 803maptile::clear_header ()
913{ 804{
… …
943maptile::do_destroy () 834maptile::do_destroy ()
944{ 835{
945 attachable::do_destroy (); 836 attachable::do_destroy ();
946 837
947 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 }
948} 906}
949 907
950/* 908/*
951 * 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).
952 */ 910 */
… …
1000 if (QUERY_FLAG (op, FLAG_GENERATOR)) 958 if (QUERY_FLAG (op, FLAG_GENERATOR))
1001 { 959 {
1002 total_exp += op->stats.exp; 960 total_exp += op->stats.exp;
1003 961
1004 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 962 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1005 total_exp += at->clone.stats.exp * 8; 963 total_exp += at->stats.exp * 8;
1006 964
1007 monster_cnt++; 965 monster_cnt++;
1008 } 966 }
1009 } 967 }
1010 968
… …
1232 vol += op->volume (); 1190 vol += op->volume ();
1233 1191
1234 return vol; 1192 return vol;
1235} 1193}
1236 1194
1237/* this updates the orig_map->tile_map[tile_num] value after finding 1195bool
1238 * the map. It also takes care of linking back the freshly found 1196maptile::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{ 1197{
1245 maptile *mp = orig_map->tile_map [tile_num]; 1198 if (!tile_path[dir])
1199 return 0;
1246 1200
1247 if (!mp) 1201 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1248 { 1202 return 1;
1249 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1250 1203
1251 if (!mp) 1204 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1252 { 1205 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 1206
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; 1207 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} 1208}
1279 1209
1280/* this returns TRUE if the coordinates (x,y) are out of 1210/* this returns TRUE if the coordinates (x,y) are out of
1281 * map m. This function also takes into account any 1211 * map m. This function also takes into account any
1282 * tiling considerations, loading adjacant maps as needed. 1212 * tiling considerations, loading adjacant maps as needed.
… …
1295 if (!m) 1225 if (!m)
1296 return 0; 1226 return 0;
1297 1227
1298 if (x < 0) 1228 if (x < 0)
1299 { 1229 {
1300 if (!m->tile_path[3]) 1230 if (!m->tile_available (3))
1301 return 1; 1231 return 1;
1302 1232
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); 1233 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1307 } 1234 }
1308 1235
1309 if (x >= m->width) 1236 if (x >= m->width)
1310 { 1237 {
1311 if (!m->tile_path[1]) 1238 if (!m->tile_available (1))
1312 return 1; 1239 return 1;
1313 1240
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); 1241 return out_of_map (m->tile_map[1], x - m->width, y);
1318 } 1242 }
1319 1243
1320 if (y < 0) 1244 if (y < 0)
1321 { 1245 {
1322 if (!m->tile_path[0]) 1246 if (!m->tile_available (0))
1323 return 1; 1247 return 1;
1324 1248
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); 1249 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1329 } 1250 }
1330 1251
1331 if (y >= m->height) 1252 if (y >= m->height)
1332 { 1253 {
1333 if (!m->tile_path[2]) 1254 if (!m->tile_available (2))
1334 return 1; 1255 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 1256
1339 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);
1340 } 1258 }
1341 1259
1342 /* Simple case - coordinates are within this local 1260 /* Simple case - coordinates are within this local
… …
1356maptile * 1274maptile *
1357maptile::xy_find (sint16 &x, sint16 &y) 1275maptile::xy_find (sint16 &x, sint16 &y)
1358{ 1276{
1359 if (x < 0) 1277 if (x < 0)
1360 { 1278 {
1361 if (!tile_path[3]) 1279 if (!tile_available (3))
1362 return 0; 1280 return 0;
1363 1281
1364 find_and_link (this, 3);
1365 x += tile_map[3]->width; 1282 x += tile_map[3]->width;
1366 return tile_map[3]->xy_find (x, y); 1283 return tile_map[3]->xy_find (x, y);
1367 } 1284 }
1368 1285
1369 if (x >= width) 1286 if (x >= width)
1370 { 1287 {
1371 if (!tile_path[1]) 1288 if (!tile_available (1))
1372 return 0; 1289 return 0;
1373 1290
1374 find_and_link (this, 1);
1375 x -= width; 1291 x -= width;
1376 return tile_map[1]->xy_find (x, y); 1292 return tile_map[1]->xy_find (x, y);
1377 } 1293 }
1378 1294
1379 if (y < 0) 1295 if (y < 0)
1380 { 1296 {
1381 if (!tile_path[0]) 1297 if (!tile_available (0))
1382 return 0; 1298 return 0;
1383 1299
1384 find_and_link (this, 0);
1385 y += tile_map[0]->height; 1300 y += tile_map[0]->height;
1386 return tile_map[0]->xy_find (x, y); 1301 return tile_map[0]->xy_find (x, y);
1387 } 1302 }
1388 1303
1389 if (y >= height) 1304 if (y >= height)
1390 { 1305 {
1391 if (!tile_path[2]) 1306 if (!tile_available (2))
1392 return 0; 1307 return 0;
1393 1308
1394 find_and_link (this, 2);
1395 y -= height; 1309 y -= height;
1396 return tile_map[2]->xy_find (x, y); 1310 return tile_map[2]->xy_find (x, y);
1397 } 1311 }
1398 1312
1399 /* Simple case - coordinates are within this local 1313 /* Simple case - coordinates are within this local
… …
1410adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1324adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1411{ 1325{
1412 if (!map1 || !map2) 1326 if (!map1 || !map2)
1413 return 0; 1327 return 0;
1414 1328
1415 //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
1416 //fix: compare paths instead (this is likely faster, too!) 1330 //fix: compare paths instead (this is likely faster, too!)
1417 if (map1 == map2) 1331 if (map1 == map2)
1418 { 1332 {
1419 *dx = 0; 1333 *dx = 0;
1420 *dy = 0; 1334 *dy = 0;
… …
1674 1588
1675 // instead of crashing in the unlikely(?) case, try to return *something* 1589 // instead of crashing in the unlikely(?) case, try to return *something*
1676 return get_archetype ("blocked"); 1590 return get_archetype ("blocked");
1677} 1591}
1678 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