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.108 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.147 by root, Mon Sep 29 10:20:48 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
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"
29
30#include "loader.h" 27#include "loader.h"
31
32#include "path.h" 28#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 29
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 30/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 31 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 32 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 33 * new values into newmap, nx, and ny. Any and all of those
233 } 163 }
234 return 0; 164 return 0;
235} 165}
236 166
237/* 167/*
238 * Returns true if the given object can't fit in the given spot. 168 * Returns qthe blocking object if the given object can't fit in the given
239 * This is meant for multi space objects - for single space objecs, 169 * spot. This is meant for multi space objects - for single space objecs,
240 * just calling get_map_blocked and checking that against movement type 170 * just calling get_map_blocked and checking that against movement type
241 * of object. This function goes through all the parts of the 171 * of object. This function goes through all the parts of the multipart
242 * multipart object and makes sure they can be inserted. 172 * object and makes sure they can be inserted.
243 * 173 *
244 * While this doesn't call out of map, the get_map_flags does. 174 * While this doesn't call out of map, the get_map_flags does.
245 * 175 *
246 * This function has been used to deprecate arch_out_of_map - 176 * This function has been used to deprecate arch_out_of_map -
247 * this function also does that check, and since in most cases, 177 * this function also does that check, and since in most cases,
258 * 188 *
259 * Note this used to be arch_blocked, but with new movement 189 * Note this used to be arch_blocked, but with new movement
260 * code, we need to have actual object to check its move_type 190 * code, we need to have actual object to check its move_type
261 * against the move_block values. 191 * against the move_block values.
262 */ 192 */
263int 193bool
264ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 194object::blocked (maptile *m, int x, int y) const
265{ 195{
266 archetype *tmp; 196 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
267 int flag;
268 maptile *m1;
269 sint16 sx, sy;
270
271 if (!ob)
272 {
273 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
274 if (flag & P_OUT_OF_MAP)
275 return P_OUT_OF_MAP;
276
277 /* don't have object, so don't know what types would block */
278 return m1->at (sx, sy).move_block;
279 } 197 {
198 mapxy pos (m, x + tmp->x, y + tmp->y);
280 199
281 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 200 if (!pos.normalise ())
282 { 201 return 1;
283 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
284 202
285 if (flag & P_OUT_OF_MAP) 203 mapspace &ms = *pos;
286 return P_OUT_OF_MAP; 204
287 if (flag & P_IS_ALIVE) 205 if (ms.flags () & P_IS_ALIVE)
288 return P_IS_ALIVE; 206 return 1;
289 207
290 mapspace &ms = m1->at (sx, sy); 208 /* However, often ob doesn't have any move type
291 209 * (signifying non-moving objects)
292 /* find_first_free_spot() calls this function. However, often
293 * ob doesn't have any move type (when used to place exits)
294 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 210 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
295 */ 211 */
296
297 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 212 if (!move_type && ms.move_block != MOVE_ALL)
298 continue; 213 continue;
299 214
300 /* Note it is intentional that we check ob - the movement type of the 215 /* Note it is intentional that we check ob - the movement type of the
301 * head of the object should correspond for the entire object. 216 * head of the object should correspond for the entire object.
302 */ 217 */
303 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 218 if (ms.blocks (move_type))
304 return P_NO_PASS; 219 return 1;
305 } 220 }
306 221
307 return 0; 222 return 0;
308} 223}
309 224
327 242
328 insert_ob_in_ob (tmp, container); 243 insert_ob_in_ob (tmp, container);
329 tmp = next; 244 tmp = next;
330 } 245 }
331 246
332 /* sum_weight will go through and calculate what all the containers are 247 // go through and calculate what all the containers are carrying.
333 * carrying. 248 //TODO: remove
334 */ 249 container->update_weight ();
335 sum_weight (container);
336} 250}
337 251
338void 252void
339maptile::set_object_flag (int flag, int value) 253maptile::set_object_flag (int flag, int value)
340{ 254{
342 return; 256 return;
343 257
344 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 258 for (mapspace *ms = spaces + size (); ms-- > spaces; )
345 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 259 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
346 tmp->flag [flag] = value; 260 tmp->flag [flag] = value;
261}
262
263void
264maptile::post_load_original ()
265{
266 if (!spaces)
267 return;
268
269 set_object_flag (FLAG_OBJ_ORIGINAL);
270
271 for (mapspace *ms = spaces + size (); ms-- > spaces; )
272 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
273 INVOKE_OBJECT (RESET, tmp);
347} 274}
348 275
349/* link_multipart_objects go through all the objects on the map looking 276/* link_multipart_objects go through all the objects on the map looking
350 * for objects whose arch says they are multipart yet according to the 277 * for objects whose arch says they are multipart yet according to the
351 * info we have, they only have the head (as would be expected when 278 * info we have, they only have the head (as would be expected when
356{ 283{
357 if (!spaces) 284 if (!spaces)
358 return; 285 return;
359 286
360 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 287 for (mapspace *ms = spaces + size (); ms-- > spaces; )
361 for (object *op = ms->bot; op; op = op->above) 288 {
289 object *op = ms->bot;
290 while (op)
362 { 291 {
363 /* already multipart - don't do anything more */ 292 /* already multipart - don't do anything more */
364 if (op->head_ () == op && !op->more && op->arch->more) 293 if (op->head_ () == op && !op->more && op->arch->more)
365 { 294 {
366 op->remove (); 295 op->remove ();
367 op->expand_tail (); 296 op->expand_tail ();
297
298 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
299 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
300 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
368 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 301 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
302
303 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
304 // so we have to reset the iteration through the mapspace
369 } 305 }
306 else
307 op = op->above;
370 } 308 }
309 }
371} 310}
372 311
373/* 312/*
374 * Loads (ands parses) the objects into a given map from the specified 313 * Loads (ands parses) the objects into a given map from the specified
375 * file pointer. 314 * file pointer.
377bool 316bool
378maptile::_load_objects (object_thawer &f) 317maptile::_load_objects (object_thawer &f)
379{ 318{
380 for (;;) 319 for (;;)
381 { 320 {
382 coroapi::cede_to_tick_every (100); // cede once in a while 321 coroapi::cede_to_tick (); // cede once in a while
383 322
384 switch (f.kw) 323 switch (f.kw)
385 { 324 {
386 case KW_arch: 325 case KW_arch:
387 if (object *op = object::read (f, this)) 326 if (object *op = object::read (f, this))
388 { 327 {
328 // TODO: why?
389 if (op->inv) 329 if (op->inv)
390 sum_weight (op); 330 op->update_weight ();
391 331
392 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 332 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
333 {
334 // we insert manually because
335 // a) its way faster
336 // b) we remove manually, too, and there are good reasons for that
337 // c) its correct
338 mapspace &ms = at (op->x, op->y);
339
340 op->flag [FLAG_REMOVED] = false;
341
342 op->above = 0;
343 op->below = ms.top;
344
345 if (ms.top)
346 ms.top->above = op;
347 else
348 ms.bot = op;
349
350 ms.top = op;
351 ms.flags_ = 0;
352 }
353 else
354 {
355 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
356 op->destroy_inv (false); // be explicit about dropping
357 op->destroy (true);
358 }
393 } 359 }
394 360
395 continue; 361 continue;
396 362
397 case KW_EOF: 363 case KW_EOF:
410} 376}
411 377
412void 378void
413maptile::activate () 379maptile::activate ()
414{ 380{
415 active = true;
416
417 if (spaces) 381 if (spaces)
418 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 382 for (mapspace *ms = spaces + size (); ms-- > spaces; )
419 for (object *op = ms->bot; op; op = op->above) 383 for (object *op = ms->bot; op; op = op->above)
420 op->activate_recursive (); 384 op->activate_recursive ();
421} 385}
422 386
423void 387void
424maptile::deactivate () 388maptile::deactivate ()
425{ 389{
426 active = false;
427
428 if (spaces) 390 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 391 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 392 for (object *op = ms->bot; op; op = op->above)
431 op->deactivate_recursive (); 393 op->deactivate_recursive ();
432} 394}
442 if (!spaces) 404 if (!spaces)
443 return false; 405 return false;
444 406
445 for (int i = 0; i < size (); ++i) 407 for (int i = 0; i < size (); ++i)
446 { 408 {
447 int unique = 0; 409 bool unique = 0;
410
448 for (object *op = spaces [i].bot; op; op = op->above) 411 for (object *op = spaces [i].bot; op; op = op->above)
449 { 412 {
450 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 413 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
451 unique = 1;
452 414
453 if (!op->can_map_save ()) 415 if (expect_false (!op->can_map_save ()))
454 continue; 416 continue;
455 417
456 if (unique || op->flag [FLAG_UNIQUE]) 418 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
457 { 419 {
458 if (flags & IO_UNIQUES) 420 if (flags & IO_UNIQUES)
459 op->write (f); 421 op->write (f);
460 } 422 }
461 else if (flags & IO_OBJECTS) 423 else if (expect_true (flags & IO_OBJECTS))
462 op->write (f); 424 op->write (f);
463 } 425 }
464 } 426 }
465 427
466 coroapi::cede_to_tick (); 428 coroapi::cede_to_tick ();
467 429
468 return true; 430 return true;
469}
470
471bool
472maptile::_load_objects (const char *path, bool skip_header)
473{
474 object_thawer f (path);
475
476 if (!f)
477 return false;
478
479 f.next ();
480
481 if (skip_header)
482 for (;;)
483 {
484 keyword kw = f.kw;
485 f.skip ();
486 if (kw == KW_end)
487 break;
488 }
489
490 return _load_objects (f);
491} 431}
492 432
493bool 433bool
494maptile::_save_objects (const char *path, int flags) 434maptile::_save_objects (const char *path, int flags)
495{ 435{
670bool 610bool
671maptile::_load_header (object_thawer &thawer) 611maptile::_load_header (object_thawer &thawer)
672{ 612{
673 for (;;) 613 for (;;)
674 { 614 {
675 thawer.next ();
676
677 switch (thawer.kw) 615 switch (thawer.kw)
678 { 616 {
679 case KW_msg: 617 case KW_msg:
680 thawer.get_ml (KW_endmsg, msg); 618 thawer.get_ml (KW_endmsg, msg);
681 break; 619 break;
714 case KW_winddir: thawer.get (winddir); break; 652 case KW_winddir: thawer.get (winddir); break;
715 case KW_sky: thawer.get (sky); break; 653 case KW_sky: thawer.get (sky); break;
716 654
717 case KW_per_player: thawer.get (per_player); break; 655 case KW_per_player: thawer.get (per_player); break;
718 case KW_per_party: thawer.get (per_party); break; 656 case KW_per_party: thawer.get (per_party); break;
657 case KW_no_reset: thawer.get (no_reset); break;
658 case KW_no_drop: thawer.get (no_drop); break;
719 659
720 case KW_region: default_region = region::find (thawer.get_str ()); break; 660 case KW_region: default_region = region::find (thawer.get_str ()); break;
721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 661 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
722 662
723 // old names new names 663 // old names new names
734 case KW_tile_path_1: thawer.get (tile_path [0]); break; 674 case KW_tile_path_1: thawer.get (tile_path [0]); break;
735 case KW_tile_path_2: thawer.get (tile_path [1]); break; 675 case KW_tile_path_2: thawer.get (tile_path [1]); break;
736 case KW_tile_path_3: thawer.get (tile_path [2]); break; 676 case KW_tile_path_3: thawer.get (tile_path [2]); break;
737 case KW_tile_path_4: thawer.get (tile_path [3]); break; 677 case KW_tile_path_4: thawer.get (tile_path [3]); break;
738 678
679 case KW_ERROR:
680 set_key_text (thawer.kw_str, thawer.value);
681 break;
682
739 case KW_end: 683 case KW_end:
684 thawer.next ();
740 return true; 685 return true;
741 686
742 default: 687 default:
743 if (!thawer.parse_error ("map", 0)) 688 if (!thawer.parse_error ("map", 0))
744 return false; 689 return false;
745 break; 690 break;
746 } 691 }
692
693 thawer.next ();
747 } 694 }
748 695
749 abort (); 696 abort ();
750}
751
752bool
753maptile::_load_header (const char *path)
754{
755 object_thawer thawer (path);
756
757 if (!thawer)
758 return false;
759
760 return _load_header (thawer);
761} 697}
762 698
763/****************************************************************************** 699/******************************************************************************
764 * This is the start of unique map handling code 700 * This is the start of unique map handling code
765 *****************************************************************************/ 701 *****************************************************************************/
779 unique = 1; 715 unique = 1;
780 716
781 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 717 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
782 { 718 {
783 op->destroy_inv (false); 719 op->destroy_inv (false);
784 op->destroy (); 720 op->destroy (true);
785 } 721 }
786 722
787 op = above; 723 op = above;
788 } 724 }
789 } 725 }
800 if (name) MAP_OUT (name); 736 if (name) MAP_OUT (name);
801 MAP_OUT (swap_time); 737 MAP_OUT (swap_time);
802 MAP_OUT (reset_time); 738 MAP_OUT (reset_time);
803 MAP_OUT (reset_timeout); 739 MAP_OUT (reset_timeout);
804 MAP_OUT (fixed_resettime); 740 MAP_OUT (fixed_resettime);
741 MAP_OUT (no_reset);
742 MAP_OUT (no_drop);
805 MAP_OUT (difficulty); 743 MAP_OUT (difficulty);
806 744
807 if (default_region) MAP_OUT2 (region, default_region->name); 745 if (default_region) MAP_OUT2 (region, default_region->name);
808 746
809 if (shopitems) 747 if (shopitems)
863 * Remove and free all objects in the given map. 801 * Remove and free all objects in the given map.
864 */ 802 */
865void 803void
866maptile::clear () 804maptile::clear ()
867{ 805{
868 sfree (regions, size ()), regions = 0;
869 free (regionmap), regionmap = 0;
870
871 if (spaces) 806 if (spaces)
872 { 807 {
873 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 808 for (mapspace *ms = spaces + size (); ms-- > spaces; )
874 while (object *op = ms->bot) 809 while (object *op = ms->bot)
875 { 810 {
811 // manually remove, as to not trigger anything
812 if (ms->bot = op->above)
813 ms->bot->below = 0;
814
815 op->flag [FLAG_REMOVED] = true;
816
876 op = op->head_ (); 817 object *head = op->head_ ();
818 if (op == head)
819 {
877 op->destroy_inv (false); 820 op->destroy_inv (false);
878 op->destroy (); 821 op->destroy (true);
822 }
823 else if (head->map != op->map)
824 {
825 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
826 head->destroy (true);
827 }
879 } 828 }
880 829
881 sfree (spaces, size ()), spaces = 0; 830 sfree0 (spaces, size ());
882 } 831 }
883 832
884 if (buttons) 833 if (buttons)
885 free_objectlinkpt (buttons), buttons = 0; 834 free_objectlinkpt (buttons), buttons = 0;
835
836 sfree0 (regions, size ());
837 delete [] regionmap; regionmap = 0;
886} 838}
887 839
888void 840void
889maptile::clear_header () 841maptile::clear_header ()
890{ 842{
920maptile::do_destroy () 872maptile::do_destroy ()
921{ 873{
922 attachable::do_destroy (); 874 attachable::do_destroy ();
923 875
924 clear (); 876 clear ();
877}
878
879/* decay and destroy perishable items in a map */
880void
881maptile::do_decay_objects ()
882{
883 if (!spaces)
884 return;
885
886 for (mapspace *ms = spaces + size (); ms-- > spaces; )
887 for (object *above, *op = ms->bot; op; op = above)
888 {
889 above = op->above;
890
891 bool destroy = 0;
892
893 // do not decay anything above unique floor tiles (yet :)
894 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
895 break;
896
897 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
898 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
899 || QUERY_FLAG (op, FLAG_UNIQUE)
900 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
901 || QUERY_FLAG (op, FLAG_UNPAID)
902 || op->is_alive ())
903 ; // do not decay
904 else if (op->is_weapon ())
905 {
906 op->stats.dam--;
907 if (op->stats.dam < 0)
908 destroy = 1;
909 }
910 else if (op->is_armor ())
911 {
912 op->stats.ac--;
913 if (op->stats.ac < 0)
914 destroy = 1;
915 }
916 else if (op->type == FOOD)
917 {
918 op->stats.food -= rndm (5, 20);
919 if (op->stats.food < 0)
920 destroy = 1;
921 }
922 else
923 {
924 int mat = op->materials;
925
926 if (mat & M_PAPER
927 || mat & M_LEATHER
928 || mat & M_WOOD
929 || mat & M_ORGANIC
930 || mat & M_CLOTH
931 || mat & M_LIQUID
932 || (mat & M_IRON && rndm (1, 5) == 1)
933 || (mat & M_GLASS && rndm (1, 2) == 1)
934 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
935 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
936 || (mat & M_ICE && temp > 32))
937 destroy = 1;
938 }
939
940 /* adjust overall chance below */
941 if (destroy && rndm (0, 1))
942 op->destroy (true);
943 }
925} 944}
926 945
927/* 946/*
928 * Updates every button on the map (by calling update_button() for them). 947 * Updates every button on the map (by calling update_button() for them).
929 */ 948 */
976 995
977 if (QUERY_FLAG (op, FLAG_GENERATOR)) 996 if (QUERY_FLAG (op, FLAG_GENERATOR))
978 { 997 {
979 total_exp += op->stats.exp; 998 total_exp += op->stats.exp;
980 999
981 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 1000 if (archetype *at = op->other_arch)
1001 {
982 total_exp += at->stats.exp * 8; 1002 total_exp += at->stats.exp * 8;
983
984 monster_cnt++; 1003 monster_cnt++;
1004 }
1005
1006 for (object *inv = op->inv; inv; inv = inv->below)
1007 {
1008 total_exp += op->stats.exp * 8;
1009 monster_cnt++;
1010 }
985 } 1011 }
986 } 1012 }
987 1013
988 avgexp = (double) total_exp / monster_cnt; 1014 avgexp = (double) total_exp / monster_cnt;
989 1015
1028 else 1054 else
1029 darkness = new_level; 1055 darkness = new_level;
1030 1056
1031 /* All clients need to get re-updated for the change */ 1057 /* All clients need to get re-updated for the change */
1032 update_all_map_los (this); 1058 update_all_map_los (this);
1059
1033 return 1; 1060 return 1;
1034} 1061}
1035 1062
1036/* 1063/*
1037 * This function updates various attributes about a specific space 1064 * This function updates various attributes about a specific space
1040 * through, etc) 1067 * through, etc)
1041 */ 1068 */
1042void 1069void
1043mapspace::update_ () 1070mapspace::update_ ()
1044{ 1071{
1045 object *tmp, *last = 0; 1072 object *last = 0;
1046 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1073 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1047 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1074 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1048 1075
1049 //object *middle = 0; 1076 //object *middle = 0;
1050 //object *top = 0; 1077 //object *top = 0;
1052 // this seems to generate better code than using locals, above 1079 // this seems to generate better code than using locals, above
1053 object *&top = faces_obj[0] = 0; 1080 object *&top = faces_obj[0] = 0;
1054 object *&middle = faces_obj[1] = 0; 1081 object *&middle = faces_obj[1] = 0;
1055 object *&floor = faces_obj[2] = 0; 1082 object *&floor = faces_obj[2] = 0;
1056 1083
1057 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1084 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1058 { 1085 {
1059 /* This could be made additive I guess (two lights better than 1086 /* This could be made additive I guess (two lights better than
1060 * one). But if so, it shouldn't be a simple additive - 2 1087 * one). But if so, it shouldn't be a simple additive - 2
1061 * light bulbs do not illuminate twice as far as once since 1088 * light bulbs do not illuminate twice as far as once since
1062 * it is a dissapation factor that is cubed. 1089 * it is a dissapation factor that is cubed.
1063 */ 1090 */
1064 if (tmp->glow_radius > light)
1065 light = tmp->glow_radius; 1091 light = max (light, tmp->glow_radius);
1066 1092
1067 /* This call is needed in order to update objects the player 1093 /* This call is needed in order to update objects the player
1068 * is standing in that have animations (ie, grass, fire, etc). 1094 * is standing in that have animations (ie, grass, fire, etc).
1069 * However, it also causes the look window to be re-drawn 1095 * However, it also causes the look window to be re-drawn
1070 * 3 times each time the player moves, because many of the 1096 * 3 times each time the player moves, because many of the
1089 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1115 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1090 { 1116 {
1091 middle = tmp; 1117 middle = tmp;
1092 anywhere = 1; 1118 anywhere = 1;
1093 } 1119 }
1120
1094 /* Find the highest visible face around. If equal 1121 /* Find the highest visible face around. If equal
1095 * visibilities, we still want the one nearer to the 1122 * visibilities, we still want the one nearer to the
1096 * top 1123 * top
1097 */ 1124 */
1098 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1125 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1147 * 1) top face is set, need middle to be set. 1174 * 1) top face is set, need middle to be set.
1148 * 2) middle is set, need to set top. 1175 * 2) middle is set, need to set top.
1149 * 3) neither middle or top is set - need to set both. 1176 * 3) neither middle or top is set - need to set both.
1150 */ 1177 */
1151 1178
1152 for (tmp = last; tmp; tmp = tmp->below) 1179 for (object *tmp = last; tmp; tmp = tmp->below)
1153 { 1180 {
1154 /* Once we get to a floor, stop, since we already have a floor object */ 1181 /* Once we get to a floor, stop, since we already have a floor object */
1155 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1182 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1156 break; 1183 break;
1157 1184
1209 vol += op->volume (); 1236 vol += op->volume ();
1210 1237
1211 return vol; 1238 return vol;
1212} 1239}
1213 1240
1214/* this updates the orig_map->tile_map[tile_num] value after finding 1241bool
1215 * the map. It also takes care of linking back the freshly found 1242maptile::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{ 1243{
1222 maptile *mp = orig_map->tile_map [tile_num]; 1244 if (!tile_path[dir])
1245 return 0;
1223 1246
1224 if (!mp) 1247 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1225 { 1248 return 1;
1226 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1227 1249
1228 if (!mp) 1250 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1229 { 1251 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 1252
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; 1253 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} 1254}
1256 1255
1257/* this returns TRUE if the coordinates (x,y) are out of 1256/* this returns TRUE if the coordinates (x,y) are out of
1258 * map m. This function also takes into account any 1257 * map m. This function also takes into account any
1259 * tiling considerations, loading adjacant maps as needed. 1258 * tiling considerations, loading adjacant maps as needed.
1272 if (!m) 1271 if (!m)
1273 return 0; 1272 return 0;
1274 1273
1275 if (x < 0) 1274 if (x < 0)
1276 { 1275 {
1277 if (!m->tile_path[3]) 1276 if (!m->tile_available (3))
1278 return 1; 1277 return 1;
1279 1278
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); 1279 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1284 } 1280 }
1285 1281
1286 if (x >= m->width) 1282 if (x >= m->width)
1287 { 1283 {
1288 if (!m->tile_path[1]) 1284 if (!m->tile_available (1))
1289 return 1; 1285 return 1;
1290 1286
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); 1287 return out_of_map (m->tile_map[1], x - m->width, y);
1295 } 1288 }
1296 1289
1297 if (y < 0) 1290 if (y < 0)
1298 { 1291 {
1299 if (!m->tile_path[0]) 1292 if (!m->tile_available (0))
1300 return 1; 1293 return 1;
1301 1294
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); 1295 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1306 } 1296 }
1307 1297
1308 if (y >= m->height) 1298 if (y >= m->height)
1309 { 1299 {
1310 if (!m->tile_path[2]) 1300 if (!m->tile_available (2))
1311 return 1; 1301 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 1302
1316 return out_of_map (m->tile_map[2], x, y - m->height); 1303 return out_of_map (m->tile_map[2], x, y - m->height);
1317 } 1304 }
1318 1305
1319 /* Simple case - coordinates are within this local 1306 /* Simple case - coordinates are within this local
1333maptile * 1320maptile *
1334maptile::xy_find (sint16 &x, sint16 &y) 1321maptile::xy_find (sint16 &x, sint16 &y)
1335{ 1322{
1336 if (x < 0) 1323 if (x < 0)
1337 { 1324 {
1338 if (!tile_path[3]) 1325 if (!tile_available (3))
1339 return 0; 1326 return 0;
1340 1327
1341 find_and_link (this, 3);
1342 x += tile_map[3]->width; 1328 x += tile_map[3]->width;
1343 return tile_map[3]->xy_find (x, y); 1329 return tile_map[3]->xy_find (x, y);
1344 } 1330 }
1345 1331
1346 if (x >= width) 1332 if (x >= width)
1347 { 1333 {
1348 if (!tile_path[1]) 1334 if (!tile_available (1))
1349 return 0; 1335 return 0;
1350 1336
1351 find_and_link (this, 1);
1352 x -= width; 1337 x -= width;
1353 return tile_map[1]->xy_find (x, y); 1338 return tile_map[1]->xy_find (x, y);
1354 } 1339 }
1355 1340
1356 if (y < 0) 1341 if (y < 0)
1357 { 1342 {
1358 if (!tile_path[0]) 1343 if (!tile_available (0))
1359 return 0; 1344 return 0;
1360 1345
1361 find_and_link (this, 0);
1362 y += tile_map[0]->height; 1346 y += tile_map[0]->height;
1363 return tile_map[0]->xy_find (x, y); 1347 return tile_map[0]->xy_find (x, y);
1364 } 1348 }
1365 1349
1366 if (y >= height) 1350 if (y >= height)
1367 { 1351 {
1368 if (!tile_path[2]) 1352 if (!tile_available (2))
1369 return 0; 1353 return 0;
1370 1354
1371 find_and_link (this, 2);
1372 y -= height; 1355 y -= height;
1373 return tile_map[2]->xy_find (x, y); 1356 return tile_map[2]->xy_find (x, y);
1374 } 1357 }
1375 1358
1376 /* Simple case - coordinates are within this local 1359 /* Simple case - coordinates are within this local
1387adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1370adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1388{ 1371{
1389 if (!map1 || !map2) 1372 if (!map1 || !map2)
1390 return 0; 1373 return 0;
1391 1374
1392 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1375 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1393 //fix: compare paths instead (this is likely faster, too!) 1376 //fix: compare paths instead (this is likely faster, too!)
1394 if (map1 == map2) 1377 if (map1 == map2)
1395 { 1378 {
1396 *dx = 0; 1379 *dx = 0;
1397 *dy = 0; 1380 *dy = 0;
1604} 1587}
1605 1588
1606object * 1589object *
1607maptile::insert (object *op, int x, int y, object *originator, int flags) 1590maptile::insert (object *op, int x, int y, object *originator, int flags)
1608{ 1591{
1609 if (!op->flag [FLAG_REMOVED])
1610 op->remove ();
1611
1612 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1592 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1613} 1593}
1614 1594
1615region * 1595region *
1616maptile::region (int x, int y) const 1596maptile::region (int x, int y) const
1626 1606
1627 return ::region::default_region (); 1607 return ::region::default_region ();
1628} 1608}
1629 1609
1630/* picks a random object from a style map. 1610/* picks a random object from a style map.
1631 * Redone by MSW so it should be faster and not use static
1632 * variables to generate tables.
1633 */ 1611 */
1634object * 1612object *
1635maptile::pick_random_object () const 1613maptile::pick_random_object (rand_gen &gen) const
1636{ 1614{
1637 /* while returning a null object will result in a crash, that 1615 /* while returning a null object will result in a crash, that
1638 * is actually preferable to an infinite loop. That is because 1616 * is actually preferable to an infinite loop. That is because
1639 * most servers will automatically restart in case of crash. 1617 * most servers will automatically restart in case of crash.
1640 * Change the logic on getting the random space - shouldn't make 1618 * Change the logic on getting the random space - shouldn't make
1641 * any difference, but this seems clearer to me. 1619 * any difference, but this seems clearer to me.
1642 */ 1620 */
1643 for (int i = 1000; --i;) 1621 for (int i = 1000; --i;)
1644 { 1622 {
1645 object *pick = at (rndm (width), rndm (height)).bot; 1623 object *pick = at (gen (width), gen (height)).bot;
1646 1624
1647 // do not prefer big monsters just because they are big. 1625 // do not prefer big monsters just because they are big.
1648 if (pick && pick->head_ () == pick) 1626 if (pick && pick->is_head ())
1649 return pick->head_ (); 1627 return pick->head_ ();
1650 } 1628 }
1651 1629
1652 // instead of crashing in the unlikely(?) case, try to return *something* 1630 // instead of crashing in the unlikely(?) case, try to return *something*
1653 return get_archetype ("blocked"); 1631 return archetype::find ("bug");
1654} 1632}
1655 1633
1634void
1635maptile::play_sound (faceidx sound, int x, int y) const
1636{
1637 if (!sound)
1638 return;
1639
1640 for_all_players (pl)
1641 if (pl->ob->map == this)
1642 if (client *ns = pl->ns)
1643 {
1644 int dx = x - pl->ob->x;
1645 int dy = y - pl->ob->y;
1646
1647 int distance = idistance (dx, dy);
1648
1649 if (distance <= MAX_SOUND_DISTANCE)
1650 ns->play_sound (sound, dx, dy);
1651 }
1652}
1653

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines