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.71 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.119 by root, Fri Aug 24 00:53:54 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. 20 *
21
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 strcpy (buf, create_pathname (name));
73 else
74 strcpy (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;
231} 168}
232
233 169
234/* 170/*
235 * Returns true if the given object can't fit in the given spot. 171 * Returns true if the given object can't fit in the given spot.
236 * This is meant for multi space objects - for single space objecs, 172 * 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
… …
273 209
274 /* don't have object, so don't know what types would block */ 210 /* don't have object, so don't know what types would block */
275 return m1->at (sx, sy).move_block; 211 return m1->at (sx, sy).move_block;
276 } 212 }
277 213
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
279 { 215 {
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
281 217
282 if (flag & P_OUT_OF_MAP) 218 if (flag & P_OUT_OF_MAP)
283 return P_OUT_OF_MAP; 219 return P_OUT_OF_MAP;
284 if (flag & P_IS_ALIVE) 220 if (flag & P_IS_ALIVE)
285 return P_IS_ALIVE; 221 return P_IS_ALIVE;
… …
344} 280}
345 281
346/* 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
347 * 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
348 * 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
349 * they are saved). We do have to look for the old maps that did save 285 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 286 */
352void 287void
353maptile::link_multipart_objects () 288maptile::link_multipart_objects ()
354{ 289{
355 if (!spaces) 290 if (!spaces)
356 return; 291 return;
357 292
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 293 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; ) 294 {
295 object *op = ms->bot;
296 while (op)
360 { 297 {
361 object *above = tmp->above;
362
363 /* already multipart - don't do anything more */ 298 /* already multipart - don't do anything more */
364 if (!tmp->head && !tmp->more) 299 if (op->head_ () == op && !op->more && op->arch->more)
365 {
366 /* If there is nothing more to this object, this for loop
367 * won't do anything.
368 */
369 archetype *at;
370 object *last, *op;
371 for (at = tmp->arch->more, last = tmp;
372 at;
373 at = at->more, last = op)
374 { 300 {
375 op = arch_to_object (at); 301 op->remove ();
302 op->expand_tail ();
376 303
377 /* update x,y coordinates */ 304 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
378 op->x += tmp->x; 305 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
379 op->y += tmp->y; 306 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
380 op->head = tmp;
381 op->map = this;
382 last->more = op;
383 op->name = tmp->name;
384 op->title = tmp->title;
385
386 /* we could link all the parts onto tmp, and then just
387 * call insert_ob_in_map once, but the effect is the same,
388 * as insert_ob_in_map will call itself with each part, and
389 * the coding is simpler to just to it here with each part.
390 */
391 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
392 } 311 }
312 else
313 op = op->above;
393 } 314 }
394
395 tmp = above;
396 } 315 }
397} 316}
398 317
399/* 318/*
400 * 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
401 * file pointer. 320 * file pointer.
402 * mapflags is the same as we get with load_original_map
403 */ 321 */
404bool 322bool
405maptile::load_objects (object_thawer &thawer) 323maptile::_load_objects (object_thawer &f)
406{ 324{
407 int unique; 325 for (;;)
408 object *op, *prev = NULL, *last_more = NULL, *otmp;
409
410 op = object::create ();
411 op->map = this; /* To handle buttons correctly */
412
413 while (int i = load_object (thawer, op, 0))
414 { 326 {
415 /* if the archetype for the object is null, means that we 327 coroapi::cede_to_tick_every (100); // cede once in a while
416 * got an invalid object. Don't do anything with it - the game 328
417 * or editor will not be able to do anything with it either. 329 switch (f.kw)
418 */
419 if (op->arch == NULL)
420 { 330 {
421 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 331 case KW_arch:
422 continue; 332 if (object *op = object::read (f, this))
423 }
424
425 switch (i)
426 { 333 {
427 case LL_NORMAL: 334 if (op->inv)
335 sum_weight (op);
336
428 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 }
429 339
430 if (op->inv) 340 continue;
431 sum_weight (op);
432 341
433 prev = op, last_more = op;
434 break;
435
436 case LL_MORE: 342 case KW_EOF:
437 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 343 return true;
438 op->head = prev, last_more->more = op, last_more = op; 344
345 default:
346 if (!f.parse_error ("map file"))
347 return false;
439 break; 348 break;
440 } 349 }
441 350
442 op = object::create (); 351 f.next ();
443 op->map = this;
444 }
445
446 op->destroy ();
447
448#if 0
449 for (i = 0; i < width; i++)
450 for (j = 0; j < height; j++)
451 {
452 unique = 0;
453 /* check for unique items, or unique squares */
454 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
455 {
456 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
457 unique = 1;
458
459 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
460 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
461 }
462 } 352 }
463#endif
464 353
465 return true; 354 return true;
466} 355}
467 356
468void 357void
469maptile::activate () 358maptile::activate ()
470{ 359{
471 if (!spaces) 360 if (spaces)
472 return;
473
474 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 361 for (mapspace *ms = spaces + size (); ms-- > spaces; )
475 for (object *op = ms->bot; op; op = op->above) 362 for (object *op = ms->bot; op; op = op->above)
476 op->activate_recursive (); 363 op->activate_recursive ();
477} 364}
478 365
479void 366void
480maptile::deactivate () 367maptile::deactivate ()
481{ 368{
482 if (!spaces) 369 if (spaces)
483 return;
484
485 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
486 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
487 op->deactivate_recursive (); 372 op->deactivate_recursive ();
488} 373}
489 374
490bool 375bool
491maptile::save_objects (object_freezer &freezer, int flags) 376maptile::_save_objects (object_freezer &f, int flags)
492{ 377{
493 static int cede_count = 0; 378 coroapi::cede_to_tick ();
494 379
495 if (flags & IO_HEADER) 380 if (flags & IO_HEADER)
496 save_header (freezer); 381 _save_header (f);
497 382
498 if (!spaces) 383 if (!spaces)
499 return false; 384 return false;
500 385
501 for (int i = 0; i < size (); ++i) 386 for (int i = 0; i < size (); ++i)
502 { 387 {
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508
509 int unique = 0; 388 int unique = 0;
510 for (object *op = spaces [i].bot; op; op = op->above) 389 for (object *op = spaces [i].bot; op; op = op->above)
511 { 390 {
512 // count per-object, but cede only when modification-safe
513 cede_count++;
514
515 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 391 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
516 unique = 1; 392 unique = 1;
517 393
518 if (!op->can_map_save ()) 394 if (!op->can_map_save ())
519 continue; 395 continue;
520 396
521 if (unique || op->flag [FLAG_UNIQUE]) 397 if (unique || op->flag [FLAG_UNIQUE])
522 { 398 {
523 if (flags & IO_UNIQUES) 399 if (flags & IO_UNIQUES)
524 save_object (freezer, op, 1); 400 op->write (f);
525 } 401 }
526 else if (flags & IO_OBJECTS) 402 else if (flags & IO_OBJECTS)
527 save_object (freezer, op, 1); 403 op->write (f);
528 } 404 }
529 } 405 }
530 406
407 coroapi::cede_to_tick ();
408
531 return true; 409 return true;
532} 410}
533 411
534bool 412bool
535maptile::load_objects (const char *path, bool skip_header) 413maptile::_load_objects (const char *path, bool skip_header)
536{ 414{
537 object_thawer thawer (path); 415 object_thawer f (path);
538 416
539 if (!thawer) 417 if (!f)
540 return false; 418 return false;
419
420 f.next ();
541 421
542 if (skip_header) 422 if (skip_header)
543 for (;;) 423 for (;;)
544 { 424 {
545 keyword kw = thawer.get_kv (); 425 keyword kw = f.kw;
546 426 f.skip ();
547 if (kw == KW_end) 427 if (kw == KW_end)
548 break; 428 break;
549
550 thawer.skip_kv (kw);
551 } 429 }
552 430
553 return load_objects (thawer); 431 return _load_objects (f);
554} 432}
555 433
556bool 434bool
557maptile::save_objects (const char *path, int flags) 435maptile::_save_objects (const char *path, int flags)
558{ 436{
559 object_freezer freezer; 437 object_freezer freezer;
560 438
561 if (!save_objects (freezer, flags)) 439 if (!_save_objects (freezer, flags))
562 return false; 440 return false;
563 441
564 return freezer.save (path); 442 return freezer.save (path);
565} 443}
566 444
567maptile::maptile () 445maptile::maptile ()
568{ 446{
569 in_memory = MAP_SWAPPED; 447 in_memory = MAP_SWAPPED;
570 448
571 /* The maps used to pick up default x and y values from the 449 /* The maps used to pick up default x and y values from the
572 * map archetype. Mimic that behaviour. 450 * map archetype. Mimic that behaviour.
573 */ 451 */
574 width = 16; 452 width = 16;
575 height = 16; 453 height = 16;
576 reset_timeout = 0;
577 timeout = 300; 454 timeout = 300;
578 enter_x = 0; 455 max_nrof = 1000; // 1000 items of anything
579 enter_y = 0; 456 max_volume = 2000000; // 2m³
580} 457}
581 458
582maptile::maptile (int w, int h) 459maptile::maptile (int w, int h)
583{ 460{
584 in_memory = MAP_SWAPPED; 461 in_memory = MAP_SWAPPED;
… …
730 * This could be done in lex (like the object loader), but I think 607 * This could be done in lex (like the object loader), but I think
731 * currently, there are few enough fields this is not a big deal. 608 * currently, there are few enough fields this is not a big deal.
732 * MSW 2001-07-01 609 * MSW 2001-07-01
733 */ 610 */
734bool 611bool
735maptile::load_header (object_thawer &thawer) 612maptile::_load_header (object_thawer &thawer)
736{ 613{
737 for (;;) 614 for (;;)
738 { 615 {
739 keyword kw = thawer.get_kv (); 616 thawer.next ();
740 617
741 switch (kw) 618 switch (thawer.kw)
742 { 619 {
743 case KW_EOF:
744 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
745 return false;
746
747 case KW_end:
748 return true;
749
750 default:
751 case KW_ERROR:
752 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
753 break;
754
755 case KW_msg: 620 case KW_msg:
756 thawer.get_ml (KW_endmsg, msg); 621 thawer.get_ml (KW_endmsg, msg);
757 break; 622 break;
758 623
759 case KW_lore: // CF+ extension 624 case KW_lore: // CF+ extension
… …
790 case KW_winddir: thawer.get (winddir); break; 655 case KW_winddir: thawer.get (winddir); break;
791 case KW_sky: thawer.get (sky); break; 656 case KW_sky: thawer.get (sky); break;
792 657
793 case KW_per_player: thawer.get (per_player); break; 658 case KW_per_player: thawer.get (per_player); break;
794 case KW_per_party: thawer.get (per_party); break; 659 case KW_per_party: thawer.get (per_party); break;
660 case KW_no_reset: thawer.get (no_reset); break;
795 661
796 case KW_region: get_region_by_name (thawer.get_str ()); break; 662 case KW_region: default_region = region::find (thawer.get_str ()); break;
797 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
798 664
799 // old names new names 665 // old names new names
800 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 666 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
801 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 667 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
809 675
810 case KW_tile_path_1: thawer.get (tile_path [0]); break; 676 case KW_tile_path_1: thawer.get (tile_path [0]); break;
811 case KW_tile_path_2: thawer.get (tile_path [1]); break; 677 case KW_tile_path_2: thawer.get (tile_path [1]); break;
812 case KW_tile_path_3: thawer.get (tile_path [2]); break; 678 case KW_tile_path_3: thawer.get (tile_path [2]); break;
813 case KW_tile_path_4: thawer.get (tile_path [3]); break; 679 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680
681 case KW_ERROR:
682 set_key (thawer.kw_str, thawer.value);
683 break;
684
685 case KW_end:
686 return true;
687
688 default:
689 if (!thawer.parse_error ("map", 0))
690 return false;
691 break;
814 } 692 }
815 } 693 }
816 694
817 abort (); 695 abort ();
818} 696}
819 697
820bool 698bool
821maptile::load_header (const char *path) 699maptile::_load_header (const char *path)
822{ 700{
823 object_thawer thawer (path); 701 object_thawer thawer (path);
824 702
825 if (!thawer) 703 if (!thawer)
826 return false; 704 return false;
827 705
828 return load_header (thawer); 706 return _load_header (thawer);
829} 707}
830 708
831/****************************************************************************** 709/******************************************************************************
832 * This is the start of unique map handling code 710 * This is the start of unique map handling code
833 *****************************************************************************/ 711 *****************************************************************************/
… …
844 object *above = op->above; 722 object *above = op->above;
845 723
846 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 724 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
847 unique = 1; 725 unique = 1;
848 726
849 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 727 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
850 { 728 {
851 op->destroy_inv (false); 729 op->destroy_inv (false);
852 op->destroy (); 730 op->destroy ();
853 } 731 }
854 732
… …
856 } 734 }
857 } 735 }
858} 736}
859 737
860bool 738bool
861maptile::save_header (object_freezer &freezer) 739maptile::_save_header (object_freezer &freezer)
862{ 740{
863#define MAP_OUT(k) freezer.put (KW_ ## k, k) 741#define MAP_OUT(k) freezer.put (KW_ ## k, k)
864#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 742#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
865 743
866 MAP_OUT2 (arch, "map"); 744 MAP_OUT2 (arch, "map");
… …
868 if (name) MAP_OUT (name); 746 if (name) MAP_OUT (name);
869 MAP_OUT (swap_time); 747 MAP_OUT (swap_time);
870 MAP_OUT (reset_time); 748 MAP_OUT (reset_time);
871 MAP_OUT (reset_timeout); 749 MAP_OUT (reset_timeout);
872 MAP_OUT (fixed_resettime); 750 MAP_OUT (fixed_resettime);
751 MAP_OUT (no_reset);
873 MAP_OUT (difficulty); 752 MAP_OUT (difficulty);
874 753
875 if (region) MAP_OUT2 (region, region->name); 754 if (default_region) MAP_OUT2 (region, default_region->name);
876 755
877 if (shopitems) 756 if (shopitems)
878 { 757 {
879 char shop[MAX_BUF]; 758 char shop[MAX_BUF];
880 print_shop_string (this, shop); 759 print_shop_string (this, shop);
… …
915 794
916 return true; 795 return true;
917} 796}
918 797
919bool 798bool
920maptile::save_header (const char *path) 799maptile::_save_header (const char *path)
921{ 800{
922 object_freezer freezer; 801 object_freezer freezer;
923 802
924 if (!save_header (freezer)) 803 if (!_save_header (freezer))
925 return false; 804 return false;
926 805
927 return freezer.save (path); 806 return freezer.save (path);
928} 807}
929 808
… …
931 * Remove and free all objects in the given map. 810 * Remove and free all objects in the given map.
932 */ 811 */
933void 812void
934maptile::clear () 813maptile::clear ()
935{ 814{
815 sfree (regions, size ()); regions = 0;
816 delete [] regionmap; regionmap = 0;
817
936 if (!spaces) 818 if (spaces)
937 return; 819 {
938
939 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 820 for (mapspace *ms = spaces + size (); ms-- > spaces; )
940 while (object *op = ms->bot) 821 while (object *op = ms->bot)
941 { 822 {
942 if (op->head)
943 op = op->head; 823 op = op->head_ ();
944
945 op->destroy_inv (false); 824 op->destroy_inv (false);
946 op->destroy (); 825 op->destroy ();
947 } 826 }
948 827
949 sfree (spaces, size ()), spaces = 0; 828 sfree (spaces, size ()), spaces = 0;
829 }
950 830
951 if (buttons) 831 if (buttons)
952 free_objectlinkpt (buttons), buttons = 0; 832 free_objectlinkpt (buttons), buttons = 0;
953} 833}
954 834
… …
987maptile::do_destroy () 867maptile::do_destroy ()
988{ 868{
989 attachable::do_destroy (); 869 attachable::do_destroy ();
990 870
991 clear (); 871 clear ();
872}
873
874/* decay and destroy perishable items in a map */
875void
876maptile::do_decay_objects ()
877{
878 if (!spaces)
879 return;
880
881 for (mapspace *ms = spaces + size (); ms-- > spaces; )
882 for (object *above, *op = ms->bot; op; op = above)
883 {
884 above = op->above;
885
886 bool destroy = 0;
887
888 // do not decay anything above unique floor tiles (yet :)
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890 break;
891
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ())
899 ; // do not decay
900 else if (op->is_weapon ())
901 {
902 op->stats.dam--;
903 if (op->stats.dam < 0)
904 destroy = 1;
905 }
906 else if (op->is_armor ())
907 {
908 op->stats.ac--;
909 if (op->stats.ac < 0)
910 destroy = 1;
911 }
912 else if (op->type == FOOD)
913 {
914 op->stats.food -= rndm (5, 20);
915 if (op->stats.food < 0)
916 destroy = 1;
917 }
918 else
919 {
920 int mat = op->materials;
921
922 if (mat & M_PAPER
923 || mat & M_LEATHER
924 || mat & M_WOOD
925 || mat & M_ORGANIC
926 || mat & M_CLOTH
927 || mat & M_LIQUID
928 || (mat & M_IRON && rndm (1, 5) == 1)
929 || (mat & M_GLASS && rndm (1, 2) == 1)
930 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
931 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
932 || (mat & M_ICE && temp > 32))
933 destroy = 1;
934 }
935
936 /* adjust overall chance below */
937 if (destroy && rndm (0, 1))
938 op->destroy ();
939 }
992} 940}
993 941
994/* 942/*
995 * Updates every button on the map (by calling update_button() for them). 943 * Updates every button on the map (by calling update_button() for them).
996 */ 944 */
… …
1044 if (QUERY_FLAG (op, FLAG_GENERATOR)) 992 if (QUERY_FLAG (op, FLAG_GENERATOR))
1045 { 993 {
1046 total_exp += op->stats.exp; 994 total_exp += op->stats.exp;
1047 995
1048 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 996 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1049 total_exp += at->clone.stats.exp * 8; 997 total_exp += at->stats.exp * 8;
1050 998
1051 monster_cnt++; 999 monster_cnt++;
1052 } 1000 }
1053 } 1001 }
1054 1002
… …
1108 */ 1056 */
1109void 1057void
1110mapspace::update_ () 1058mapspace::update_ ()
1111{ 1059{
1112 object *tmp, *last = 0; 1060 object *tmp, *last = 0;
1113 uint8 flags = 0, light = 0, anywhere = 0; 1061 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1114 New_Face *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; 1062 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1063
1118 middle = blank_face; 1064 //object *middle = 0;
1119 top = blank_face; 1065 //object *top = 0;
1120 floor = blank_face; 1066 //object *floor = 0;
1121 1067 // this seems to generate better code than using locals, above
1122 middle_obj = 0; 1068 object *&top = faces_obj[0] = 0;
1123 top_obj = 0; 1069 object *&middle = faces_obj[1] = 0;
1124 floor_obj = 0; 1070 object *&floor = faces_obj[2] = 0;
1125 1071
1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1072 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1127 { 1073 {
1128 /* This could be made additive I guess (two lights better than 1074 /* This could be made additive I guess (two lights better than
1129 * one). But if so, it shouldn't be a simple additive - 2 1075 * one). But if so, it shouldn't be a simple additive - 2
… …
1142 * Always put the player down for drawing. 1088 * Always put the player down for drawing.
1143 */ 1089 */
1144 if (!tmp->invisible) 1090 if (!tmp->invisible)
1145 { 1091 {
1146 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1092 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1147 {
1148 top = tmp->face;
1149 top_obj = tmp; 1093 top = tmp;
1150 }
1151 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1094 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1152 { 1095 {
1153 /* If we got a floor, that means middle and top were below it, 1096 /* If we got a floor, that means middle and top were below it,
1154 * so should not be visible, so we clear them. 1097 * so should not be visible, so we clear them.
1155 */ 1098 */
1156 middle = blank_face; 1099 middle = 0;
1157 top = blank_face; 1100 top = 0;
1158 floor = tmp->face;
1159 floor_obj = tmp; 1101 floor = tmp;
1160 } 1102 }
1161 /* Flag anywhere have high priority */ 1103 /* Flag anywhere have high priority */
1162 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1104 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1163 { 1105 {
1164 middle = tmp->face;
1165
1166 middle_obj = tmp; 1106 middle = tmp;
1167 anywhere = 1; 1107 anywhere = 1;
1168 } 1108 }
1169 /* Find the highest visible face around. If equal 1109 /* Find the highest visible face around. If equal
1170 * visibilities, we still want the one nearer to the 1110 * visibilities, we still want the one nearer to the
1171 * top 1111 * top
1172 */ 1112 */
1173 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1113 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1174 {
1175 middle = tmp->face;
1176 middle_obj = tmp; 1114 middle = tmp;
1177 }
1178 } 1115 }
1179 1116
1180 if (tmp == tmp->above) 1117 if (tmp == tmp->above)
1181 { 1118 {
1182 LOG (llevError, "Error in structure of map\n"); 1119 LOG (llevError, "Error in structure of map\n");
… …
1217 * middle face. This should not happen, as we already have the 1154 * middle face. This should not happen, as we already have the
1218 * else statement above so middle should not get set. OTOH, it 1155 * else statement above so middle should not get set. OTOH, it
1219 * may be possible for the faces to match but be different objects. 1156 * may be possible for the faces to match but be different objects.
1220 */ 1157 */
1221 if (top == middle) 1158 if (top == middle)
1222 middle = blank_face; 1159 middle = 0;
1223 1160
1224 /* There are three posibilities at this point: 1161 /* There are three posibilities at this point:
1225 * 1) top face is set, need middle to be set. 1162 * 1) top face is set, need middle to be set.
1226 * 2) middle is set, need to set top. 1163 * 2) middle is set, need to set top.
1227 * 3) neither middle or top is set - need to set both. 1164 * 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 */ 1169 /* Once we get to a floor, stop, since we already have a floor object */
1233 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1170 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1234 break; 1171 break;
1235 1172
1236 /* If two top faces are already set, quit processing */ 1173 /* If two top faces are already set, quit processing */
1237 if ((top != blank_face) && (middle != blank_face)) 1174 if (top && middle)
1238 break; 1175 break;
1239 1176
1240 /* Only show visible faces */ 1177 /* Only show visible faces */
1241 if (!tmp->invisible) 1178 if (!tmp->invisible)
1242 { 1179 {
1243 /* Fill in top if needed */ 1180 /* Fill in top if needed */
1244 if (top == blank_face) 1181 if (!top)
1245 { 1182 {
1246 top = tmp->face;
1247 top_obj = tmp; 1183 top = tmp;
1248 if (top == middle) 1184 if (top == middle)
1249 middle = blank_face; 1185 middle = 0;
1250 } 1186 }
1251 else 1187 else
1252 { 1188 {
1253 /* top is already set - we should only get here if 1189 /* top is already set - we should only get here if
1254 * middle is not set 1190 * middle is not set
1255 * 1191 *
1256 * Set the middle face and break out, since there is nothing 1192 * Set the middle face and break out, since there is nothing
1257 * more to fill in. We don't check visiblity here, since 1193 * more to fill in. We don't check visiblity here, since
1258 * 1194 *
1259 */ 1195 */
1260 if (tmp->face != top) 1196 if (tmp != top)
1261 { 1197 {
1262 middle = tmp->face;
1263 middle_obj = tmp; 1198 middle = tmp;
1264 break; 1199 break;
1265 } 1200 }
1266 } 1201 }
1267 } 1202 }
1268 } 1203 }
1269 1204
1270 if (middle == floor) 1205 if (middle == floor)
1271 middle = blank_face; 1206 middle = 0;
1272 1207
1273 if (top == middle) 1208 if (top == middle)
1274 middle = blank_face; 1209 middle = 0;
1275 1210
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1211#if 0
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1212 faces_obj [0] = top;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1213 faces_obj [1] = middle;
1214 faces_obj [2] = floor;
1215#endif
1279} 1216}
1280 1217
1281/* this updates the orig_map->tile_map[tile_num] value after finding 1218uint64
1282 * the map. It also takes care of linking back the freshly found 1219mapspace::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{ 1220{
1289 maptile *mp = orig_map->tile_map [tile_num]; 1221 uint64 vol = 0;
1290 1222
1291 if (!mp) 1223 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1292 { 1224 vol += op->volume ();
1293 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1294 1225
1295 if (!mp) 1226 return vol;
1296 { 1227}
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 1228
1306 int dest_tile = (tile_num + 2) % 4; 1229bool
1230maptile::tile_available (int dir, bool load)
1231{
1232 if (!tile_path[dir])
1233 return 0;
1307 1234
1308 orig_map->tile_map [tile_num] = mp; 1235 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1236 return 1;
1309 1237
1310 // optimisation: back-link map to origin map if euclidean 1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1311 //TODO: non-euclidean maps MUST GO 1239 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 1240
1315 return mp; 1241 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} 1242}
1323 1243
1324/* this returns TRUE if the coordinates (x,y) are out of 1244/* this returns TRUE if the coordinates (x,y) are out of
1325 * map m. This function also takes into account any 1245 * map m. This function also takes into account any
1326 * tiling considerations, loading adjacant maps as needed. 1246 * tiling considerations, loading adjacant maps as needed.
… …
1339 if (!m) 1259 if (!m)
1340 return 0; 1260 return 0;
1341 1261
1342 if (x < 0) 1262 if (x < 0)
1343 { 1263 {
1344 if (!m->tile_path[3]) 1264 if (!m->tile_available (3))
1345 return 1; 1265 return 1;
1346 1266
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); 1267 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1351 } 1268 }
1352 1269
1353 if (x >= m->width) 1270 if (x >= m->width)
1354 { 1271 {
1355 if (!m->tile_path[1]) 1272 if (!m->tile_available (1))
1356 return 1; 1273 return 1;
1357 1274
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); 1275 return out_of_map (m->tile_map[1], x - m->width, y);
1362 } 1276 }
1363 1277
1364 if (y < 0) 1278 if (y < 0)
1365 { 1279 {
1366 if (!m->tile_path[0]) 1280 if (!m->tile_available (0))
1367 return 1; 1281 return 1;
1368 1282
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); 1283 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1373 } 1284 }
1374 1285
1375 if (y >= m->height) 1286 if (y >= m->height)
1376 { 1287 {
1377 if (!m->tile_path[2]) 1288 if (!m->tile_available (2))
1378 return 1; 1289 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 1290
1383 return out_of_map (m->tile_map[2], x, y - m->height); 1291 return out_of_map (m->tile_map[2], x, y - m->height);
1384 } 1292 }
1385 1293
1386 /* Simple case - coordinates are within this local 1294 /* Simple case - coordinates are within this local
… …
1400maptile * 1308maptile *
1401maptile::xy_find (sint16 &x, sint16 &y) 1309maptile::xy_find (sint16 &x, sint16 &y)
1402{ 1310{
1403 if (x < 0) 1311 if (x < 0)
1404 { 1312 {
1405 if (!tile_path[3]) 1313 if (!tile_available (3))
1406 return 0; 1314 return 0;
1407 1315
1408 find_and_link (this, 3);
1409 x += tile_map[3]->width; 1316 x += tile_map[3]->width;
1410 return tile_map[3]->xy_find (x, y); 1317 return tile_map[3]->xy_find (x, y);
1411 } 1318 }
1412 1319
1413 if (x >= width) 1320 if (x >= width)
1414 { 1321 {
1415 if (!tile_path[1]) 1322 if (!tile_available (1))
1416 return 0; 1323 return 0;
1417 1324
1418 find_and_link (this, 1);
1419 x -= width; 1325 x -= width;
1420 return tile_map[1]->xy_find (x, y); 1326 return tile_map[1]->xy_find (x, y);
1421 } 1327 }
1422 1328
1423 if (y < 0) 1329 if (y < 0)
1424 { 1330 {
1425 if (!tile_path[0]) 1331 if (!tile_available (0))
1426 return 0; 1332 return 0;
1427 1333
1428 find_and_link (this, 0);
1429 y += tile_map[0]->height; 1334 y += tile_map[0]->height;
1430 return tile_map[0]->xy_find (x, y); 1335 return tile_map[0]->xy_find (x, y);
1431 } 1336 }
1432 1337
1433 if (y >= height) 1338 if (y >= height)
1434 { 1339 {
1435 if (!tile_path[2]) 1340 if (!tile_available (2))
1436 return 0; 1341 return 0;
1437 1342
1438 find_and_link (this, 2);
1439 y -= height; 1343 y -= height;
1440 return tile_map[2]->xy_find (x, y); 1344 return tile_map[2]->xy_find (x, y);
1441 } 1345 }
1442 1346
1443 /* Simple case - coordinates are within this local 1347 /* Simple case - coordinates are within this local
… …
1448 1352
1449/** 1353/**
1450 * Return whether map2 is adjacent to map1. If so, store the distance from 1354 * Return whether map2 is adjacent to map1. If so, store the distance from
1451 * map1 to map2 in dx/dy. 1355 * map1 to map2 in dx/dy.
1452 */ 1356 */
1453static int 1357int
1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1358adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1455{ 1359{
1456 if (!map1 || !map2) 1360 if (!map1 || !map2)
1457 return 0; 1361 return 0;
1458 1362
… …
1549/* From map.c 1453/* From map.c
1550 * This is used by get_player to determine where the other 1454 * This is used by get_player to determine where the other
1551 * creature is. get_rangevector takes into account map tiling, 1455 * creature is. get_rangevector takes into account map tiling,
1552 * so you just can not look the the map coordinates and get the 1456 * so you just can not look the the map coordinates and get the
1553 * righte value. distance_x/y are distance away, which 1457 * righte value. distance_x/y are distance away, which
1554 * can be negativbe. direction is the crossfire direction scheme 1458 * can be negative. direction is the crossfire direction scheme
1555 * that the creature should head. part is the part of the 1459 * that the creature should head. part is the part of the
1556 * monster that is closest. 1460 * monster that is closest.
1557 * 1461 *
1558 * get_rangevector looks at op1 and op2, and fills in the 1462 * get_rangevector looks at op1 and op2, and fills in the
1559 * structure for op1 to get to op2. 1463 * structure for op1 to get to op2.
… …
1570get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1474get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1571{ 1475{
1572 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1476 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1573 { 1477 {
1574 /* be conservative and fill in _some_ data */ 1478 /* be conservative and fill in _some_ data */
1575 retval->distance = 100000; 1479 retval->distance = 10000;
1576 retval->distance_x = 32767; 1480 retval->distance_x = 10000;
1577 retval->distance_y = 32767; 1481 retval->distance_y = 10000;
1578 retval->direction = 0; 1482 retval->direction = 0;
1579 retval->part = 0; 1483 retval->part = 0;
1580 } 1484 }
1581 else 1485 else
1582 { 1486 {
… …
1587 1491
1588 best = op1; 1492 best = op1;
1589 /* If this is multipart, find the closest part now */ 1493 /* If this is multipart, find the closest part now */
1590 if (!(flags & 0x1) && op1->more) 1494 if (!(flags & 0x1) && op1->more)
1591 { 1495 {
1592 object *tmp;
1593 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1496 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1594 1497
1595 /* we just take the offset of the piece to head to figure 1498 /* we just take the offset of the piece to head to figure
1596 * distance instead of doing all that work above again 1499 * distance instead of doing all that work above again
1597 * since the distance fields we set above are positive in the 1500 * since the distance fields we set above are positive in the
1598 * same axis as is used for multipart objects, the simply arithmetic 1501 * same axis as is used for multipart objects, the simply arithmetic
1599 * below works. 1502 * below works.
1600 */ 1503 */
1601 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1504 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1602 { 1505 {
1603 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1506 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); 1507 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1605 if (tmpi < best_distance) 1508 if (tmpi < best_distance)
1606 { 1509 {
1607 best_distance = tmpi; 1510 best_distance = tmpi;
1608 best = tmp; 1511 best = tmp;
1609 } 1512 }
1610 } 1513 }
1514
1611 if (best != op1) 1515 if (best != op1)
1612 { 1516 {
1613 retval->distance_x += op1->x - best->x; 1517 retval->distance_x += op1->x - best->x;
1614 retval->distance_y += op1->y - best->y; 1518 retval->distance_y += op1->y - best->y;
1615 } 1519 }
1616 } 1520 }
1521
1617 retval->part = best; 1522 retval->part = best;
1618 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1523 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1619 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1524 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1620 } 1525 }
1621} 1526}
1622 1527
1623/* this is basically the same as get_rangevector above, but instead of 1528/* this is basically the same as get_rangevector above, but instead of
… …
1628 * flags has no meaning for this function at this time - I kept it in to 1533 * flags has no meaning for this function at this time - I kept it in to
1629 * be more consistant with the above function and also in case they are needed 1534 * be more consistant with the above function and also in case they are needed
1630 * for something in the future. Also, since no object is pasted, the best 1535 * for something in the future. Also, since no object is pasted, the best
1631 * field of the rv_vector is set to NULL. 1536 * field of the rv_vector is set to NULL.
1632 */ 1537 */
1633
1634void 1538void
1635get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1539get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1636{ 1540{
1637 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1541 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1638 { 1542 {
1639 /* be conservative and fill in _some_ data */ 1543 /* be conservative and fill in _some_ data */
1640 retval->distance = 100000; 1544 retval->distance = 100000;
… …
1647 { 1551 {
1648 retval->distance_x += op2->x - x; 1552 retval->distance_x += op2->x - x;
1649 retval->distance_y += op2->y - y; 1553 retval->distance_y += op2->y - y;
1650 1554
1651 retval->part = NULL; 1555 retval->part = NULL;
1652 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1556 retval->distance = idistance (retval->distance_x, retval->distance_y);
1653 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1557 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1654 } 1558 }
1655} 1559}
1656 1560
1657/* Returns true of op1 and op2 are effectively on the same map 1561/* Returns true of op1 and op2 are effectively on the same map
… …
1677 op->remove (); 1581 op->remove ();
1678 1582
1679 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1583 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1680} 1584}
1681 1585
1586region *
1587maptile::region (int x, int y) const
1588{
1589 if (regions
1590 && regionmap
1591 && !OUT_OF_REAL_MAP (this, x, y))
1592 if (struct region *reg = regionmap [regions [y * width + x]])
1593 return reg;
1594
1595 if (default_region)
1596 return default_region;
1597
1598 return ::region::default_region ();
1599}
1600
1601/* picks a random object from a style map.
1602 * Redone by MSW so it should be faster and not use static
1603 * variables to generate tables.
1604 */
1605object *
1606maptile::pick_random_object () const
1607{
1608 /* while returning a null object will result in a crash, that
1609 * is actually preferable to an infinite loop. That is because
1610 * most servers will automatically restart in case of crash.
1611 * Change the logic on getting the random space - shouldn't make
1612 * any difference, but this seems clearer to me.
1613 */
1614 for (int i = 1000; --i;)
1615 {
1616 object *pick = at (rndm (width), rndm (height)).bot;
1617
1618 // do not prefer big monsters just because they are big.
1619 if (pick && pick->head_ () == pick)
1620 return pick->head_ ();
1621 }
1622
1623 // instead of crashing in the unlikely(?) case, try to return *something*
1624 return get_archetype ("blocked");
1625}
1626
1627void
1628maptile::play_sound (faceidx sound, int x, int y) const
1629{
1630 if (!sound)
1631 return;
1632
1633 for_all_players (pl)
1634 if (pl->ob->map == this)
1635 if (client *ns = pl->ns)
1636 {
1637 int dx = x - pl->ob->x;
1638 int dy = y - pl->ob->y;
1639
1640 int distance = idistance (dx, dy);
1641
1642 if (distance <= MAX_SOUND_DISTANCE)
1643 ns->play_sound (sound, dx, dy);
1644 }
1645}
1646

Diff Legend

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