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.84 by root, Mon Feb 5 01:24:45 2007 UTC vs.
Revision 1.127 by root, Fri Sep 7 18:03:31 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 24#include <unistd.h>
30 25
26#include "global.h"
27#include "funcpoint.h"
28
29#include "loader.h"
30
31#include "path.h" 31#include "path.h"
32
33/*
34 * This makes a path absolute outside the world of Crossfire.
35 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
36 * and returns the pointer to a static array containing the result.
37 * it really should be called create_mapname
38 */
39const char *
40create_pathname (const char *name)
41{
42 static char buf[8192];
43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44 return buf;
45}
46
47/*
48 * This function checks if a file with the given path exists.
49 * -1 is returned if it fails, otherwise the mode of the file
50 * is returned.
51 * It tries out all the compression suffixes listed in the uncomp[] array.
52 *
53 * If prepend_dir is set, then we call create_pathname (which prepends
54 * libdir & mapdir). Otherwise, we assume the name given is fully
55 * complete.
56 * Only the editor actually cares about the writablity of this -
57 * the rest of the code only cares that the file is readable.
58 * when the editor goes away, the call to stat should probably be
59 * replaced by an access instead (similar to the windows one, but
60 * that seems to be missing the prepend_dir processing
61 */
62int
63check_path (const char *name, int prepend_dir)
64{
65 char buf[MAX_BUF];
66
67 char *endbuf;
68 struct stat statbuf;
69 int mode = 0;
70
71 if (prepend_dir)
72 assign (buf, create_pathname (name));
73 else
74 assign (buf, name);
75
76 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through
79 * all the names.
80 */
81 endbuf = buf + strlen (buf);
82
83 if (stat (buf, &statbuf))
84 return -1;
85 if (!S_ISREG (statbuf.st_mode))
86 return (-1);
87
88 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
89 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
90 mode |= 4;
91
92 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
93 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
94 mode |= 2;
95
96 return (mode);
97}
98 32
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
102 * 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
… …
173 * let the player through (inventory checkers for example) 107 * let the player through (inventory checkers for example)
174 */ 108 */
175 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 109 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176 return 0; 110 return 0;
177 111
178 if (ob->head != NULL)
179 ob = ob->head; 112 ob = ob->head_ ();
180 113
181 /* 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
182 * 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
183 * true. If we get through the entire stack, that must mean 116 * true. If we get through the entire stack, that must mean
184 * ob is blocking it, so return 0. 117 * ob is blocking it, so return 0.
… …
214 else 147 else
215 { 148 {
216 /* Broke apart a big nasty if into several here to make 149 /* Broke apart a big nasty if into several here to make
217 * this more readable. first check - if the space blocks 150 * this more readable. first check - if the space blocks
218 * movement, can't move here. 151 * movement, can't move here.
219 * 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
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 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 157
225 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))
226 return 1; 163 return 1;
227 } 164 }
228 165
229 } 166 }
230 return 0; 167 return 0;
… …
272 209
273 /* don't have object, so don't know what types would block */ 210 /* don't have object, so don't know what types would block */
274 return m1->at (sx, sy).move_block; 211 return m1->at (sx, sy).move_block;
275 } 212 }
276 213
277 for (tmp = ob->arch; tmp; tmp = tmp->more) 214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
278 { 215 {
279 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
280 217
281 if (flag & P_OUT_OF_MAP) 218 if (flag & P_OUT_OF_MAP)
282 return P_OUT_OF_MAP; 219 return P_OUT_OF_MAP;
283 if (flag & P_IS_ALIVE) 220 if (flag & P_IS_ALIVE)
284 return P_IS_ALIVE; 221 return P_IS_ALIVE;
… …
343} 280}
344 281
345/* link_multipart_objects go through all the objects on the map looking 282/* link_multipart_objects go through all the objects on the map looking
346 * for objects whose arch says they are multipart yet according to the 283 * for objects whose arch says they are multipart yet according to the
347 * info we have, they only have the head (as would be expected when 284 * info we have, they only have the head (as would be expected when
348 * they are saved). We do have to look for the old maps that did save 285 * they are saved).
349 * the more sections and not re-add sections for them.
350 */ 286 */
351void 287void
352maptile::link_multipart_objects () 288maptile::link_multipart_objects ()
353{ 289{
354 if (!spaces) 290 if (!spaces)
355 return; 291 return;
356 292
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 293 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *tmp = ms->bot; tmp; ) 294 {
295 object *op = ms->bot;
296 while (op)
359 { 297 {
360 object *above = tmp->above;
361
362 /* already multipart - don't do anything more */ 298 /* already multipart - don't do anything more */
363 if (!tmp->head && !tmp->more) 299 if (op->head_ () == op && !op->more && op->arch->more)
364 {
365 /* If there is nothing more to this object, this for loop
366 * won't do anything.
367 */
368 archetype *at;
369 object *last, *op;
370 for (at = tmp->arch->more, last = tmp;
371 at;
372 at = at->more, last = op)
373 { 300 {
374 op = arch_to_object (at); 301 op->remove ();
302 op->expand_tail ();
375 303
376 /* update x,y coordinates */ 304 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
377 op->x += tmp->x; 305 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
378 op->y += tmp->y; 306 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
379 op->head = tmp;
380 op->map = this;
381 last->more = op;
382 op->name = tmp->name;
383 op->title = tmp->title;
384
385 /* we could link all the parts onto tmp, and then just
386 * call insert_ob_in_map once, but the effect is the same,
387 * as insert_ob_in_map will call itself with each part, and
388 * the coding is simpler to just to it here with each part.
389 */
390 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 307 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
308
309 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
310 // so we have to reset the iteration through the mapspace
391 } 311 }
312 else
313 op = op->above;
392 } 314 }
393
394 tmp = above;
395 } 315 }
396} 316}
397 317
398/* 318/*
399 * Loads (ands parses) the objects into a given map from the specified 319 * Loads (ands parses) the objects into a given map from the specified
400 * file pointer. 320 * file pointer.
401 * mapflags is the same as we get with load_original_map
402 */ 321 */
403bool 322bool
404maptile::_load_objects (object_thawer &thawer) 323maptile::_load_objects (object_thawer &f)
405{ 324{
406 int unique; 325 for (;;)
407 object *op, *prev = NULL, *last_more = NULL, *otmp;
408
409 op = object::create ();
410 op->map = this; /* To handle buttons correctly */
411
412 while (int i = load_object (thawer, op, 0))
413 { 326 {
414 /* if the archetype for the object is null, means that we 327 coroapi::cede_to_tick_every (100); // cede once in a while
415 * got an invalid object. Don't do anything with it - the game 328
416 * or editor will not be able to do anything with it either. 329 switch (f.kw)
417 */
418 if (op->arch == NULL)
419 { 330 {
420 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 331 case KW_arch:
421 continue; 332 if (object *op = object::read (f, this))
422 }
423
424 switch (i)
425 { 333 {
426 case LL_NORMAL: 334 if (op->inv)
335 sum_weight (op);
336
427 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
338 }
428 339
429 if (op->inv) 340 continue;
430 sum_weight (op);
431 341
432 prev = op, last_more = op;
433 break;
434
435 case LL_MORE: 342 case KW_EOF:
436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 343 return true;
437 op->head = prev, last_more->more = op, last_more = op; 344
345 default:
346 if (!f.parse_error ("map file"))
347 return false;
438 break; 348 break;
439 } 349 }
440 350
441 op = object::create (); 351 f.next ();
442 op->map = this;
443 }
444
445 op->destroy ();
446
447#if 0
448 for (i = 0; i < width; i++)
449 for (j = 0; j < height; j++)
450 {
451 unique = 0;
452 /* check for unique items, or unique squares */
453 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454 {
455 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456 unique = 1;
457
458 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
459 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460 }
461 } 352 }
462#endif
463 353
464 return true; 354 return true;
465} 355}
466 356
467void 357void
468maptile::activate () 358maptile::activate ()
469{ 359{
470 if (!spaces) 360 if (spaces)
471 return;
472
473 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 361 for (mapspace *ms = spaces + size (); ms-- > spaces; )
474 for (object *op = ms->bot; op; op = op->above) 362 for (object *op = ms->bot; op; op = op->above)
475 op->activate_recursive (); 363 op->activate_recursive ();
476} 364}
477 365
478void 366void
479maptile::deactivate () 367maptile::deactivate ()
480{ 368{
481 if (!spaces) 369 if (spaces)
482 return;
483
484 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
485 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 372 op->deactivate_recursive ();
487} 373}
488 374
489bool 375bool
490maptile::_save_objects (object_freezer &freezer, int flags) 376maptile::_save_objects (object_freezer &f, int flags)
491{ 377{
492 static int cede_count = 0; 378 coroapi::cede_to_tick ();
493 379
494 if (flags & IO_HEADER) 380 if (flags & IO_HEADER)
495 _save_header (freezer); 381 _save_header (f);
496 382
497 if (!spaces) 383 if (!spaces)
498 return false; 384 return false;
499 385
500 for (int i = 0; i < size (); ++i) 386 for (int i = 0; i < size (); ++i)
501 { 387 {
502#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508#endif
509
510 int unique = 0; 388 bool unique = 0;
389
511 for (object *op = spaces [i].bot; op; op = op->above) 390 for (object *op = spaces [i].bot; op; op = op->above)
512 { 391 {
513 // count per-object, but cede only when modification-safe
514 cede_count++;
515
516 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 392 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
517 unique = 1;
518 393
519 if (!op->can_map_save ()) 394 if (expect_false (!op->can_map_save ()))
520 continue; 395 continue;
521 396
522 if (unique || op->flag [FLAG_UNIQUE]) 397 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
523 { 398 {
524 if (flags & IO_UNIQUES) 399 if (flags & IO_UNIQUES)
525 save_object (freezer, op, 1); 400 op->write (f);
526 } 401 }
527 else if (flags & IO_OBJECTS) 402 else if (expect_true (flags & IO_OBJECTS))
528 save_object (freezer, op, 1); 403 op->write (f);
529 } 404 }
530 } 405 }
531 406
407 coroapi::cede_to_tick ();
408
532 return true; 409 return true;
533}
534
535bool
536maptile::_load_objects (const char *path, bool skip_header)
537{
538 object_thawer thawer (path);
539
540 if (!thawer)
541 return false;
542
543 if (skip_header)
544 for (;;)
545 {
546 keyword kw = thawer.get_kv ();
547
548 if (kw == KW_end)
549 break;
550
551 thawer.skip_kv (kw);
552 }
553
554 return _load_objects (thawer);
555} 410}
556 411
557bool 412bool
558maptile::_save_objects (const char *path, int flags) 413maptile::_save_objects (const char *path, int flags)
559{ 414{
… …
568maptile::maptile () 423maptile::maptile ()
569{ 424{
570 in_memory = MAP_SWAPPED; 425 in_memory = MAP_SWAPPED;
571 426
572 /* The maps used to pick up default x and y values from the 427 /* The maps used to pick up default x and y values from the
573 * map archetype. Mimic that behaviour. 428 * map archetype. Mimic that behaviour.
574 */ 429 */
575 width = 16; 430 width = 16;
576 height = 16; 431 height = 16;
577 reset_timeout = 0;
578 timeout = 300; 432 timeout = 300;
579 enter_x = 0; 433 max_nrof = 1000; // 1000 items of anything
580 enter_y = 0; 434 max_volume = 2000000; // 2m³
581} 435}
582 436
583maptile::maptile (int w, int h) 437maptile::maptile (int w, int h)
584{ 438{
585 in_memory = MAP_SWAPPED; 439 in_memory = MAP_SWAPPED;
… …
735bool 589bool
736maptile::_load_header (object_thawer &thawer) 590maptile::_load_header (object_thawer &thawer)
737{ 591{
738 for (;;) 592 for (;;)
739 { 593 {
740 keyword kw = thawer.get_kv ();
741
742 switch (kw) 594 switch (thawer.kw)
743 { 595 {
744 case KW_msg: 596 case KW_msg:
745 thawer.get_ml (KW_endmsg, msg); 597 thawer.get_ml (KW_endmsg, msg);
746 break; 598 break;
747 599
… …
779 case KW_winddir: thawer.get (winddir); break; 631 case KW_winddir: thawer.get (winddir); break;
780 case KW_sky: thawer.get (sky); break; 632 case KW_sky: thawer.get (sky); break;
781 633
782 case KW_per_player: thawer.get (per_player); break; 634 case KW_per_player: thawer.get (per_player); break;
783 case KW_per_party: thawer.get (per_party); break; 635 case KW_per_party: thawer.get (per_party); break;
636 case KW_no_reset: thawer.get (no_reset); break;
784 637
785 case KW_region: default_region = region::find (thawer.get_str ()); break; 638 case KW_region: default_region = region::find (thawer.get_str ()); break;
786 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 639 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
787 640
788 // old names new names 641 // old names new names
… …
799 case KW_tile_path_1: thawer.get (tile_path [0]); break; 652 case KW_tile_path_1: thawer.get (tile_path [0]); break;
800 case KW_tile_path_2: thawer.get (tile_path [1]); break; 653 case KW_tile_path_2: thawer.get (tile_path [1]); break;
801 case KW_tile_path_3: thawer.get (tile_path [2]); break; 654 case KW_tile_path_3: thawer.get (tile_path [2]); break;
802 case KW_tile_path_4: thawer.get (tile_path [3]); break; 655 case KW_tile_path_4: thawer.get (tile_path [3]); break;
803 656
657 case KW_ERROR:
658 set_key_text (thawer.kw_str, thawer.value);
659 break;
660
804 case KW_end: 661 case KW_end:
662 thawer.next ();
805 return true; 663 return true;
806 664
807 default: 665 default:
808 if (!thawer.parse_error (kw, "map", 0)) 666 if (!thawer.parse_error ("map", 0))
809 return false; 667 return false;
810 break; 668 break;
811 } 669 }
670
671 thawer.next ();
812 } 672 }
813 673
814 abort (); 674 abort ();
815}
816
817bool
818maptile::_load_header (const char *path)
819{
820 object_thawer thawer (path);
821
822 if (!thawer)
823 return false;
824
825 return _load_header (thawer);
826} 675}
827 676
828/****************************************************************************** 677/******************************************************************************
829 * This is the start of unique map handling code 678 * This is the start of unique map handling code
830 *****************************************************************************/ 679 *****************************************************************************/
… …
841 object *above = op->above; 690 object *above = op->above;
842 691
843 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 692 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
844 unique = 1; 693 unique = 1;
845 694
846 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 695 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
847 { 696 {
848 op->destroy_inv (false); 697 op->destroy_inv (false);
849 op->destroy (); 698 op->destroy ();
850 } 699 }
851 700
… …
865 if (name) MAP_OUT (name); 714 if (name) MAP_OUT (name);
866 MAP_OUT (swap_time); 715 MAP_OUT (swap_time);
867 MAP_OUT (reset_time); 716 MAP_OUT (reset_time);
868 MAP_OUT (reset_timeout); 717 MAP_OUT (reset_timeout);
869 MAP_OUT (fixed_resettime); 718 MAP_OUT (fixed_resettime);
719 MAP_OUT (no_reset);
870 MAP_OUT (difficulty); 720 MAP_OUT (difficulty);
871 721
872 if (default_region) MAP_OUT2 (region, default_region->name); 722 if (default_region) MAP_OUT2 (region, default_region->name);
873 723
874 if (shopitems) 724 if (shopitems)
… …
928 * Remove and free all objects in the given map. 778 * Remove and free all objects in the given map.
929 */ 779 */
930void 780void
931maptile::clear () 781maptile::clear ()
932{ 782{
933 sfree (regions, size ()), regions = 0;
934 free (regionmap), regionmap = 0;
935
936 if (spaces) 783 if (spaces)
937 { 784 {
938 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 785 for (mapspace *ms = spaces + size (); ms-- > spaces; )
939 while (object *op = ms->bot) 786 while (object *op = ms->bot)
940 { 787 {
788 // manually remove, as to not trigger anything
789 if (ms->bot = op->above)
790 ms->bot->below = 0;
791
792 op->flag [FLAG_REMOVED] = true;
793
941 if (op->head) 794 if (op == op->head_ ())
942 op = op->head; 795 {
943
944 op->destroy_inv (false); 796 op->destroy_inv (false);
945 op->destroy (); 797 op->destroy ();
798 }
946 } 799 }
947 800
948 sfree (spaces, size ()), spaces = 0; 801 sfree (spaces, size ()), spaces = 0;
949 } 802 }
950 803
951 if (buttons) 804 if (buttons)
952 free_objectlinkpt (buttons), buttons = 0; 805 free_objectlinkpt (buttons), buttons = 0;
806
807 sfree (regions, size ()); regions = 0;
808 delete [] regionmap; regionmap = 0;
953} 809}
954 810
955void 811void
956maptile::clear_header () 812maptile::clear_header ()
957{ 813{
… …
987maptile::do_destroy () 843maptile::do_destroy ()
988{ 844{
989 attachable::do_destroy (); 845 attachable::do_destroy ();
990 846
991 clear (); 847 clear ();
848}
849
850/* decay and destroy perishable items in a map */
851void
852maptile::do_decay_objects ()
853{
854 if (!spaces)
855 return;
856
857 for (mapspace *ms = spaces + size (); ms-- > spaces; )
858 for (object *above, *op = ms->bot; op; op = above)
859 {
860 above = op->above;
861
862 bool destroy = 0;
863
864 // do not decay anything above unique floor tiles (yet :)
865 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
866 break;
867
868 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
869 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
870 || QUERY_FLAG (op, FLAG_UNIQUE)
871 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
872 || QUERY_FLAG (op, FLAG_UNPAID)
873 || op->is_alive ())
874 ; // do not decay
875 else if (op->is_weapon ())
876 {
877 op->stats.dam--;
878 if (op->stats.dam < 0)
879 destroy = 1;
880 }
881 else if (op->is_armor ())
882 {
883 op->stats.ac--;
884 if (op->stats.ac < 0)
885 destroy = 1;
886 }
887 else if (op->type == FOOD)
888 {
889 op->stats.food -= rndm (5, 20);
890 if (op->stats.food < 0)
891 destroy = 1;
892 }
893 else
894 {
895 int mat = op->materials;
896
897 if (mat & M_PAPER
898 || mat & M_LEATHER
899 || mat & M_WOOD
900 || mat & M_ORGANIC
901 || mat & M_CLOTH
902 || mat & M_LIQUID
903 || (mat & M_IRON && rndm (1, 5) == 1)
904 || (mat & M_GLASS && rndm (1, 2) == 1)
905 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
906 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
907 || (mat & M_ICE && temp > 32))
908 destroy = 1;
909 }
910
911 /* adjust overall chance below */
912 if (destroy && rndm (0, 1))
913 op->destroy ();
914 }
992} 915}
993 916
994/* 917/*
995 * Updates every button on the map (by calling update_button() for them). 918 * Updates every button on the map (by calling update_button() for them).
996 */ 919 */
… …
1044 if (QUERY_FLAG (op, FLAG_GENERATOR)) 967 if (QUERY_FLAG (op, FLAG_GENERATOR))
1045 { 968 {
1046 total_exp += op->stats.exp; 969 total_exp += op->stats.exp;
1047 970
1048 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 971 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1049 total_exp += at->clone.stats.exp * 8; 972 total_exp += at->stats.exp * 8;
1050 973
1051 monster_cnt++; 974 monster_cnt++;
1052 } 975 }
1053 } 976 }
1054 977
… …
1109void 1032void
1110mapspace::update_ () 1033mapspace::update_ ()
1111{ 1034{
1112 object *tmp, *last = 0; 1035 object *tmp, *last = 0;
1113 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1036 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1114 facetile *top, *floor, *middle;
1115 object *top_obj, *floor_obj, *middle_obj;
1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1037 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1038
1118 middle = blank_face; 1039 //object *middle = 0;
1119 top = blank_face; 1040 //object *top = 0;
1120 floor = blank_face; 1041 //object *floor = 0;
1121 1042 // this seems to generate better code than using locals, above
1122 middle_obj = 0; 1043 object *&top = faces_obj[0] = 0;
1123 top_obj = 0; 1044 object *&middle = faces_obj[1] = 0;
1124 floor_obj = 0; 1045 object *&floor = faces_obj[2] = 0;
1125 1046
1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1047 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1127 { 1048 {
1128 /* This could be made additive I guess (two lights better than 1049 /* This could be made additive I guess (two lights better than
1129 * one). But if so, it shouldn't be a simple additive - 2 1050 * one). But if so, it shouldn't be a simple additive - 2
… …
1142 * Always put the player down for drawing. 1063 * Always put the player down for drawing.
1143 */ 1064 */
1144 if (!tmp->invisible) 1065 if (!tmp->invisible)
1145 { 1066 {
1146 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1067 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1147 {
1148 top = tmp->face;
1149 top_obj = tmp; 1068 top = tmp;
1150 }
1151 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1069 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1152 { 1070 {
1153 /* If we got a floor, that means middle and top were below it, 1071 /* If we got a floor, that means middle and top were below it,
1154 * so should not be visible, so we clear them. 1072 * so should not be visible, so we clear them.
1155 */ 1073 */
1156 middle = blank_face; 1074 middle = 0;
1157 top = blank_face; 1075 top = 0;
1158 floor = tmp->face;
1159 floor_obj = tmp; 1076 floor = tmp;
1160 } 1077 }
1161 /* Flag anywhere have high priority */ 1078 /* Flag anywhere have high priority */
1162 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1079 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1163 { 1080 {
1164 middle = tmp->face;
1165
1166 middle_obj = tmp; 1081 middle = tmp;
1167 anywhere = 1; 1082 anywhere = 1;
1168 } 1083 }
1169 /* Find the highest visible face around. If equal 1084 /* Find the highest visible face around. If equal
1170 * visibilities, we still want the one nearer to the 1085 * visibilities, we still want the one nearer to the
1171 * top 1086 * top
1172 */ 1087 */
1173 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1088 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1174 {
1175 middle = tmp->face;
1176 middle_obj = tmp; 1089 middle = tmp;
1177 }
1178 } 1090 }
1179 1091
1180 if (tmp == tmp->above) 1092 if (tmp == tmp->above)
1181 { 1093 {
1182 LOG (llevError, "Error in structure of map\n"); 1094 LOG (llevError, "Error in structure of map\n");
… …
1217 * middle face. This should not happen, as we already have the 1129 * middle face. This should not happen, as we already have the
1218 * else statement above so middle should not get set. OTOH, it 1130 * else statement above so middle should not get set. OTOH, it
1219 * may be possible for the faces to match but be different objects. 1131 * may be possible for the faces to match but be different objects.
1220 */ 1132 */
1221 if (top == middle) 1133 if (top == middle)
1222 middle = blank_face; 1134 middle = 0;
1223 1135
1224 /* There are three posibilities at this point: 1136 /* There are three posibilities at this point:
1225 * 1) top face is set, need middle to be set. 1137 * 1) top face is set, need middle to be set.
1226 * 2) middle is set, need to set top. 1138 * 2) middle is set, need to set top.
1227 * 3) neither middle or top is set - need to set both. 1139 * 3) neither middle or top is set - need to set both.
… …
1232 /* Once we get to a floor, stop, since we already have a floor object */ 1144 /* Once we get to a floor, stop, since we already have a floor object */
1233 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1145 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1234 break; 1146 break;
1235 1147
1236 /* If two top faces are already set, quit processing */ 1148 /* If two top faces are already set, quit processing */
1237 if ((top != blank_face) && (middle != blank_face)) 1149 if (top && middle)
1238 break; 1150 break;
1239 1151
1240 /* Only show visible faces */ 1152 /* Only show visible faces */
1241 if (!tmp->invisible) 1153 if (!tmp->invisible)
1242 { 1154 {
1243 /* Fill in top if needed */ 1155 /* Fill in top if needed */
1244 if (top == blank_face) 1156 if (!top)
1245 { 1157 {
1246 top = tmp->face;
1247 top_obj = tmp; 1158 top = tmp;
1248 if (top == middle) 1159 if (top == middle)
1249 middle = blank_face; 1160 middle = 0;
1250 } 1161 }
1251 else 1162 else
1252 { 1163 {
1253 /* top is already set - we should only get here if 1164 /* top is already set - we should only get here if
1254 * middle is not set 1165 * middle is not set
1255 * 1166 *
1256 * Set the middle face and break out, since there is nothing 1167 * Set the middle face and break out, since there is nothing
1257 * more to fill in. We don't check visiblity here, since 1168 * more to fill in. We don't check visiblity here, since
1258 * 1169 *
1259 */ 1170 */
1260 if (tmp->face != top) 1171 if (tmp != top)
1261 { 1172 {
1262 middle = tmp->face;
1263 middle_obj = tmp; 1173 middle = tmp;
1264 break; 1174 break;
1265 } 1175 }
1266 } 1176 }
1267 } 1177 }
1268 } 1178 }
1269 1179
1270 if (middle == floor) 1180 if (middle == floor)
1271 middle = blank_face; 1181 middle = 0;
1272 1182
1273 if (top == middle) 1183 if (top == middle)
1274 middle = blank_face; 1184 middle = 0;
1275 1185
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1186#if 0
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1187 faces_obj [0] = top;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1188 faces_obj [1] = middle;
1189 faces_obj [2] = floor;
1190#endif
1279} 1191}
1280 1192
1281/* this updates the orig_map->tile_map[tile_num] value after finding 1193uint64
1282 * the map. It also takes care of linking back the freshly found 1194mapspace::volume () const
1283 * maps tile_map values if it tiles back to this one. It returns
1284 * the value of orig_map->tile_map[tile_num].
1285 */
1286static inline maptile *
1287find_and_link (maptile *orig_map, int tile_num)
1288{ 1195{
1289 maptile *mp = orig_map->tile_map [tile_num]; 1196 uint64 vol = 0;
1290 1197
1291 if (!mp) 1198 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1292 { 1199 vol += op->volume ();
1293 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1294 1200
1295 if (!mp) 1201 return vol;
1296 { 1202}
1297 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1298 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1299 &orig_map->tile_path[tile_num], &orig_map->path);
1300 mp = new maptile (1, 1);
1301 mp->alloc ();
1302 mp->in_memory = MAP_IN_MEMORY;
1303 }
1304 }
1305 1203
1306 int dest_tile = (tile_num + 2) % 4; 1204bool
1205maptile::tile_available (int dir, bool load)
1206{
1207 if (!tile_path[dir])
1208 return 0;
1307 1209
1308 orig_map->tile_map [tile_num] = mp; 1210 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1211 return 1;
1309 1212
1310 // optimisation: back-link map to origin map if euclidean 1213 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1311 //TODO: non-euclidean maps MUST GO 1214 return 1;
1312 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1313 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1314 1215
1315 return mp; 1216 return 0;
1316}
1317
1318static inline void
1319load_and_link (maptile *orig_map, int tile_num)
1320{
1321 find_and_link (orig_map, tile_num)->load_sync ();
1322} 1217}
1323 1218
1324/* this returns TRUE if the coordinates (x,y) are out of 1219/* this returns TRUE if the coordinates (x,y) are out of
1325 * map m. This function also takes into account any 1220 * map m. This function also takes into account any
1326 * tiling considerations, loading adjacant maps as needed. 1221 * tiling considerations, loading adjacant maps as needed.
… …
1339 if (!m) 1234 if (!m)
1340 return 0; 1235 return 0;
1341 1236
1342 if (x < 0) 1237 if (x < 0)
1343 { 1238 {
1344 if (!m->tile_path[3]) 1239 if (!m->tile_available (3))
1345 return 1; 1240 return 1;
1346 1241
1347 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1348 find_and_link (m, 3);
1349
1350 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1242 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1351 } 1243 }
1352 1244
1353 if (x >= m->width) 1245 if (x >= m->width)
1354 { 1246 {
1355 if (!m->tile_path[1]) 1247 if (!m->tile_available (1))
1356 return 1; 1248 return 1;
1357 1249
1358 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1359 find_and_link (m, 1);
1360
1361 return out_of_map (m->tile_map[1], x - m->width, y); 1250 return out_of_map (m->tile_map[1], x - m->width, y);
1362 } 1251 }
1363 1252
1364 if (y < 0) 1253 if (y < 0)
1365 { 1254 {
1366 if (!m->tile_path[0]) 1255 if (!m->tile_available (0))
1367 return 1; 1256 return 1;
1368 1257
1369 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1370 find_and_link (m, 0);
1371
1372 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1258 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1373 } 1259 }
1374 1260
1375 if (y >= m->height) 1261 if (y >= m->height)
1376 { 1262 {
1377 if (!m->tile_path[2]) 1263 if (!m->tile_available (2))
1378 return 1; 1264 return 1;
1379
1380 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1381 find_and_link (m, 2);
1382 1265
1383 return out_of_map (m->tile_map[2], x, y - m->height); 1266 return out_of_map (m->tile_map[2], x, y - m->height);
1384 } 1267 }
1385 1268
1386 /* Simple case - coordinates are within this local 1269 /* Simple case - coordinates are within this local
… …
1400maptile * 1283maptile *
1401maptile::xy_find (sint16 &x, sint16 &y) 1284maptile::xy_find (sint16 &x, sint16 &y)
1402{ 1285{
1403 if (x < 0) 1286 if (x < 0)
1404 { 1287 {
1405 if (!tile_path[3]) 1288 if (!tile_available (3))
1406 return 0; 1289 return 0;
1407 1290
1408 find_and_link (this, 3);
1409 x += tile_map[3]->width; 1291 x += tile_map[3]->width;
1410 return tile_map[3]->xy_find (x, y); 1292 return tile_map[3]->xy_find (x, y);
1411 } 1293 }
1412 1294
1413 if (x >= width) 1295 if (x >= width)
1414 { 1296 {
1415 if (!tile_path[1]) 1297 if (!tile_available (1))
1416 return 0; 1298 return 0;
1417 1299
1418 find_and_link (this, 1);
1419 x -= width; 1300 x -= width;
1420 return tile_map[1]->xy_find (x, y); 1301 return tile_map[1]->xy_find (x, y);
1421 } 1302 }
1422 1303
1423 if (y < 0) 1304 if (y < 0)
1424 { 1305 {
1425 if (!tile_path[0]) 1306 if (!tile_available (0))
1426 return 0; 1307 return 0;
1427 1308
1428 find_and_link (this, 0);
1429 y += tile_map[0]->height; 1309 y += tile_map[0]->height;
1430 return tile_map[0]->xy_find (x, y); 1310 return tile_map[0]->xy_find (x, y);
1431 } 1311 }
1432 1312
1433 if (y >= height) 1313 if (y >= height)
1434 { 1314 {
1435 if (!tile_path[2]) 1315 if (!tile_available (2))
1436 return 0; 1316 return 0;
1437 1317
1438 find_and_link (this, 2);
1439 y -= height; 1318 y -= height;
1440 return tile_map[2]->xy_find (x, y); 1319 return tile_map[2]->xy_find (x, y);
1441 } 1320 }
1442 1321
1443 /* Simple case - coordinates are within this local 1322 /* Simple case - coordinates are within this local
… …
1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1333adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1455{ 1334{
1456 if (!map1 || !map2) 1335 if (!map1 || !map2)
1457 return 0; 1336 return 0;
1458 1337
1459 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1338 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1460 //fix: compare paths instead (this is likely faster, too!) 1339 //fix: compare paths instead (this is likely faster, too!)
1461 if (map1 == map2) 1340 if (map1 == map2)
1462 { 1341 {
1463 *dx = 0; 1342 *dx = 0;
1464 *dy = 0; 1343 *dy = 0;
… …
1570get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1449get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1571{ 1450{
1572 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1451 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1573 { 1452 {
1574 /* be conservative and fill in _some_ data */ 1453 /* be conservative and fill in _some_ data */
1575 retval->distance = 100000; 1454 retval->distance = 10000;
1576 retval->distance_x = 32767; 1455 retval->distance_x = 10000;
1577 retval->distance_y = 32767; 1456 retval->distance_y = 10000;
1578 retval->direction = 0; 1457 retval->direction = 0;
1579 retval->part = 0; 1458 retval->part = 0;
1580 } 1459 }
1581 else 1460 else
1582 { 1461 {
… …
1587 1466
1588 best = op1; 1467 best = op1;
1589 /* If this is multipart, find the closest part now */ 1468 /* If this is multipart, find the closest part now */
1590 if (!(flags & 0x1) && op1->more) 1469 if (!(flags & 0x1) && op1->more)
1591 { 1470 {
1592 object *tmp;
1593 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1471 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1594 1472
1595 /* we just take the offset of the piece to head to figure 1473 /* we just take the offset of the piece to head to figure
1596 * distance instead of doing all that work above again 1474 * distance instead of doing all that work above again
1597 * since the distance fields we set above are positive in the 1475 * since the distance fields we set above are positive in the
1598 * same axis as is used for multipart objects, the simply arithmetic 1476 * same axis as is used for multipart objects, the simply arithmetic
1599 * below works. 1477 * below works.
1600 */ 1478 */
1601 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1479 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1602 { 1480 {
1603 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1481 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1604 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1482 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1605 if (tmpi < best_distance) 1483 if (tmpi < best_distance)
1606 { 1484 {
… …
1615 retval->distance_y += op1->y - best->y; 1493 retval->distance_y += op1->y - best->y;
1616 } 1494 }
1617 } 1495 }
1618 1496
1619 retval->part = best; 1497 retval->part = best;
1620 retval->distance = idistance (retval->distance_x, retval->distance_y); 1498 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1499 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1622 } 1500 }
1623} 1501}
1624 1502
1625/* this is basically the same as get_rangevector above, but instead of 1503/* this is basically the same as get_rangevector above, but instead of
… …
1693 return default_region; 1571 return default_region;
1694 1572
1695 return ::region::default_region (); 1573 return ::region::default_region ();
1696} 1574}
1697 1575
1576/* picks a random object from a style map.
1577 * Redone by MSW so it should be faster and not use static
1578 * variables to generate tables.
1579 */
1580object *
1581maptile::pick_random_object () const
1582{
1583 /* while returning a null object will result in a crash, that
1584 * is actually preferable to an infinite loop. That is because
1585 * most servers will automatically restart in case of crash.
1586 * Change the logic on getting the random space - shouldn't make
1587 * any difference, but this seems clearer to me.
1588 */
1589 for (int i = 1000; --i;)
1590 {
1591 object *pick = at (rndm (width), rndm (height)).bot;
1592
1593 // do not prefer big monsters just because they are big.
1594 if (pick && pick->head_ () == pick)
1595 return pick->head_ ();
1596 }
1597
1598 // instead of crashing in the unlikely(?) case, try to return *something*
1599 return get_archetype ("blocked");
1600}
1601
1602void
1603maptile::play_sound (faceidx sound, int x, int y) const
1604{
1605 if (!sound)
1606 return;
1607
1608 for_all_players (pl)
1609 if (pl->observe->map == this)
1610 if (client *ns = pl->ns)
1611 {
1612 int dx = x - pl->observe->x;
1613 int dy = y - pl->observe->y;
1614
1615 int distance = idistance (dx, dy);
1616
1617 if (distance <= MAX_SOUND_DISTANCE)
1618 ns->play_sound (sound, dx, dy);
1619 }
1620}
1621

Diff Legend

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