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.56 by root, Sat Dec 30 10:16:10 2006 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 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>
22*/ 22 */
23 23
24#include <global.h>
25#include <funcpoint.h>
26
27#include <loader.h>
28#include <unistd.h> 24#include <unistd.h>
29 25
26#include "global.h"
27#include "funcpoint.h"
28
29#include "loader.h"
30
30#include "path.h" 31#include "path.h"
31
32/*
33 * This makes a path absolute outside the world of Crossfire.
34 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
35 * and returns the pointer to a static array containing the result.
36 * it really should be called create_mapname
37 */
38const char *
39create_pathname (const char *name)
40{
41 static char buf[MAX_BUF];
42
43 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
44 * someplace else in the code? msw 2-17-97
45 */
46 if (*name == '/')
47 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
48 else
49 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name);
50 return (buf);
51}
52
53/*
54 * same as create_pathname, but for the overlay maps.
55 */
56const char *
57create_overlay_pathname (const char *name)
58{
59 static char buf[MAX_BUF];
60
61 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
62 * someplace else in the code? msw 2-17-97
63 */
64 if (*name == '/')
65 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
66 else
67 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
68 return (buf);
69}
70
71/*
72 * same as create_pathname, but for the template maps.
73 */
74const char *
75create_template_pathname (const char *name)
76{
77 static char buf[MAX_BUF];
78
79 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
80 * someplace else in the code? msw 2-17-97
81 */
82 if (*name == '/')
83 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
84 else
85 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
86 return (buf);
87}
88
89/*
90 * This makes absolute path to the itemfile where unique objects
91 * will be saved. Converts '/' to '@'. I think it's essier maintain
92 * files than full directory structure, but if this is problem it can
93 * be changed.
94 */
95static const char *
96create_items_path (const char *s)
97{
98 static char buf[MAX_BUF];
99 char *t;
100
101 if (*s == '/')
102 s++;
103
104 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
105
106 for (t = buf + strlen (buf); *s; s++, t++)
107 if (*s == '/')
108 *t = '@';
109 else
110 *t = *s;
111 *t = 0;
112 return (buf);
113}
114
115/*
116 * This function checks if a file with the given path exists.
117 * -1 is returned if it fails, otherwise the mode of the file
118 * is returned.
119 * It tries out all the compression suffixes listed in the uncomp[] array.
120 *
121 * If prepend_dir is set, then we call create_pathname (which prepends
122 * libdir & mapdir). Otherwise, we assume the name given is fully
123 * complete.
124 * Only the editor actually cares about the writablity of this -
125 * the rest of the code only cares that the file is readable.
126 * when the editor goes away, the call to stat should probably be
127 * replaced by an access instead (similar to the windows one, but
128 * that seems to be missing the prepend_dir processing
129 */
130int
131check_path (const char *name, int prepend_dir)
132{
133 char buf[MAX_BUF];
134
135 char *endbuf;
136 struct stat statbuf;
137 int mode = 0;
138
139 if (prepend_dir)
140 strcpy (buf, create_pathname (name));
141 else
142 strcpy (buf, name);
143
144 /* old method (strchr(buf, '\0')) seemd very odd to me -
145 * this method should be equivalant and is clearer.
146 * Can not use strcat because we need to cycle through
147 * all the names.
148 */
149 endbuf = buf + strlen (buf);
150
151 if (stat (buf, &statbuf))
152 return -1;
153 if (!S_ISREG (statbuf.st_mode))
154 return (-1);
155
156 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
157 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
158 mode |= 4;
159
160 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
161 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
162 mode |= 2;
163
164 return (mode);
165}
166 32
167/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
168 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
169 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
170 * 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
… …
241 * let the player through (inventory checkers for example) 107 * let the player through (inventory checkers for example)
242 */ 108 */
243 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 109 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
244 return 0; 110 return 0;
245 111
246 if (ob->head != NULL)
247 ob = ob->head; 112 ob = ob->head_ ();
248 113
249 /* 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
250 * 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
251 * true. If we get through the entire stack, that must mean 116 * true. If we get through the entire stack, that must mean
252 * ob is blocking it, so return 0. 117 * ob is blocking it, so return 0.
… …
282 else 147 else
283 { 148 {
284 /* Broke apart a big nasty if into several here to make 149 /* Broke apart a big nasty if into several here to make
285 * this more readable. first check - if the space blocks 150 * this more readable. first check - if the space blocks
286 * movement, can't move here. 151 * movement, can't move here.
287 * 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
288 * hidden dm 153 * hidden dm
289 */ 154 */
290 if (OB_MOVE_BLOCK (ob, tmp)) 155 if (OB_MOVE_BLOCK (ob, tmp))
291 return 1; 156 return 1;
292 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 157
293 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))
294 return 1; 163 return 1;
295 } 164 }
296 165
297 } 166 }
298 return 0; 167 return 0;
299} 168}
300
301 169
302/* 170/*
303 * 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.
304 * This is meant for multi space objects - for single space objecs, 172 * This is meant for multi space objects - for single space objecs,
305 * just calling get_map_blocked and checking that against movement type 173 * just calling get_map_blocked and checking that against movement type
… …
331 archetype *tmp; 199 archetype *tmp;
332 int flag; 200 int flag;
333 maptile *m1; 201 maptile *m1;
334 sint16 sx, sy; 202 sint16 sx, sy;
335 203
336 if (ob == NULL) 204 if (!ob)
337 { 205 {
338 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 206 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
339 if (flag & P_OUT_OF_MAP) 207 if (flag & P_OUT_OF_MAP)
340 return P_OUT_OF_MAP; 208 return P_OUT_OF_MAP;
341 209
342 /* 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 */
343 return m1->at (sx, sy).move_block; 211 return m1->at (sx, sy).move_block;
344 } 212 }
345 213
346 for (tmp = ob->arch; tmp; tmp = tmp->more) 214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
347 { 215 {
348 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);
349 217
350 if (flag & P_OUT_OF_MAP) 218 if (flag & P_OUT_OF_MAP)
351 return P_OUT_OF_MAP; 219 return P_OUT_OF_MAP;
352 if (flag & P_IS_ALIVE) 220 if (flag & P_IS_ALIVE)
353 return P_IS_ALIVE; 221 return P_IS_ALIVE;
… …
398 * carrying. 266 * carrying.
399 */ 267 */
400 sum_weight (container); 268 sum_weight (container);
401} 269}
402 270
271void
272maptile::set_object_flag (int flag, int value)
273{
274 if (!spaces)
275 return;
276
277 for (mapspace *ms = spaces + size (); ms-- > spaces; )
278 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
279 tmp->flag [flag] = value;
280}
281
403/* 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
404 * 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
405 * 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
406 * they are saved). We do have to look for the old maps that did save 285 * they are saved).
407 * the more sections and not re-add sections for them.
408 */ 286 */
409void 287void
410maptile::link_multipart_objects () 288maptile::link_multipart_objects ()
411{ 289{
412 if (!spaces) 290 if (!spaces)
413 return; 291 return;
414 292
415 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 293 for (mapspace *ms = spaces + size (); ms-- > spaces; )
416 for (object *tmp = ms->bot; tmp; ) 294 {
295 object *op = ms->bot;
296 while (op)
417 { 297 {
418 object *above = tmp->above;
419
420 /* already multipart - don't do anything more */ 298 /* already multipart - don't do anything more */
421 if (!tmp->head && !tmp->more) 299 if (op->head_ () == op && !op->more && op->arch->more)
422 {
423 /* If there is nothing more to this object, this for loop
424 * won't do anything.
425 */
426 archetype *at;
427 object *last, *op;
428 for (at = tmp->arch->more, last = tmp;
429 at;
430 at = at->more, last = op)
431 { 300 {
432 op = arch_to_object (at); 301 op->remove ();
302 op->expand_tail ();
433 303
434 /* update x,y coordinates */ 304 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
435 op->x += tmp->x; 305 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
436 op->y += tmp->y; 306 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
437 op->head = tmp;
438 op->map = this;
439 last->more = op;
440 op->name = tmp->name;
441 op->title = tmp->title;
442
443 /* we could link all the parts onto tmp, and then just
444 * call insert_ob_in_map once, but the effect is the same,
445 * as insert_ob_in_map will call itself with each part, and
446 * the coding is simpler to just to it here with each part.
447 */
448 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
449 } 311 }
312 else
313 op = op->above;
450 } 314 }
451
452 tmp = above;
453 } 315 }
454} 316}
455 317
456/* 318/*
457 * 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
458 * file pointer. 320 * file pointer.
459 * mapflags is the same as we get with load_original_map
460 */ 321 */
461bool 322bool
462maptile::load_objects (object_thawer &thawer) 323maptile::_load_objects (object_thawer &f)
463{ 324{
464 int unique; 325 for (;;)
465 object *op, *prev = NULL, *last_more = NULL, *otmp;
466
467 op = object::create ();
468 op->map = this; /* To handle buttons correctly */
469
470 while (int i = load_object (thawer, op, 0))
471 { 326 {
472 /* if the archetype for the object is null, means that we 327 coroapi::cede_to_tick_every (100); // cede once in a while
473 * got an invalid object. Don't do anything with it - the game 328
474 * or editor will not be able to do anything with it either. 329 switch (f.kw)
475 */
476 if (op->arch == NULL)
477 { 330 {
478 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 331 case KW_arch:
479 continue; 332 if (object *op = object::read (f, this))
480 }
481
482 switch (i)
483 { 333 {
484 case LL_NORMAL: 334 if (op->inv)
335 sum_weight (op);
336
485 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 }
486 339
487 if (op->inv) 340 continue;
488 sum_weight (op);
489 341
490 prev = op, last_more = op;
491 break;
492
493 case LL_MORE: 342 case KW_EOF:
494 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 343 return true;
495 op->head = prev, last_more->more = op, last_more = op; 344
345 default:
346 if (!f.parse_error ("map file"))
347 return false;
496 break; 348 break;
497 } 349 }
498 350
499 op = object::create (); 351 f.next ();
500 op->map = this;
501 }
502
503 op->destroy ();
504
505#if 0
506 for (i = 0; i < width; i++)
507 for (j = 0; j < height; j++)
508 {
509 unique = 0;
510 /* check for unique items, or unique squares */
511 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
512 {
513 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
514 unique = 1;
515
516 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
517 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
518 }
519 } 352 }
520#endif
521 353
522 return true; 354 return true;
523} 355}
524 356
525void 357void
526maptile::activate () 358maptile::activate ()
527{ 359{
528 if (!spaces) 360 if (spaces)
529 return;
530
531 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 361 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above) 362 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1); 363 op->activate_recursive ();
534} 364}
535 365
536void 366void
537maptile::deactivate () 367maptile::deactivate ()
538{ 368{
539 if (!spaces) 369 if (spaces)
540 return;
541
542 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1); 372 op->deactivate_recursive ();
545} 373}
546 374
547bool 375bool
548maptile::save_objects (object_freezer &freezer, int flags) 376maptile::_save_objects (object_freezer &f, int flags)
549{ 377{
378 coroapi::cede_to_tick ();
379
550 if (flags & IO_HEADER) 380 if (flags & IO_HEADER)
551 save_header (freezer); 381 _save_header (f);
552 382
553 if (!spaces) 383 if (!spaces)
554 return false; 384 return false;
555 385
556 for (int i = 0; i < size (); ++i) 386 for (int i = 0; i < size (); ++i)
557 { 387 {
558 int unique = 0; 388 bool unique = 0;
389
559 for (object *op = spaces [i].bot; op; op = op->above) 390 for (object *op = spaces [i].bot; op; op = op->above)
560 { 391 {
561 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 392 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
562 unique = 1;
563 393
564 if (!op->can_map_save ()) 394 if (expect_false (!op->can_map_save ()))
565 continue; 395 continue;
566 396
567 if (unique || op->flag [FLAG_UNIQUE]) 397 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
568 { 398 {
569 if (flags & IO_UNIQUES) 399 if (flags & IO_UNIQUES)
570 save_object (freezer, op, 1); 400 op->write (f);
571 } 401 }
572 else if (flags & IO_OBJECTS) 402 else if (expect_true (flags & IO_OBJECTS))
573 save_object (freezer, op, 1); 403 op->write (f);
574 } 404 }
575 } 405 }
576 406
407 coroapi::cede_to_tick ();
408
577 return true; 409 return true;
578} 410}
579 411
580bool 412bool
581maptile::load_objects (const char *path, bool skip_header) 413maptile::_save_objects (const char *path, int flags)
582{ 414{
583 object_thawer thawer (path); 415 object_freezer freezer;
584 416
585 if (!thawer) 417 if (!_save_objects (freezer, flags))
586 return false; 418 return false;
587 419
588 if (skip_header)
589 for (;;)
590 {
591 keyword kw = thawer.get_kv ();
592
593 if (kw == KW_end)
594 break;
595
596 thawer.skip_kv (kw);
597 }
598
599 return load_objects (thawer);
600}
601
602bool
603maptile::save_objects (const char *path, int flags)
604{
605 object_freezer freezer;
606
607 if (!save_objects (freezer, flags))
608 return false;
609
610 return freezer.save (path); 420 return freezer.save (path);
611} 421}
612 422
613maptile::maptile () 423maptile::maptile ()
614{ 424{
615 in_memory = MAP_SWAPPED; 425 in_memory = MAP_SWAPPED;
616 426
617 /* 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
618 * map archetype. Mimic that behaviour. 428 * map archetype. Mimic that behaviour.
619 */ 429 */
620 width = 16; 430 width = 16;
621 height = 16; 431 height = 16;
622 reset_timeout = 0;
623 timeout = 300; 432 timeout = 300;
624 enter_x = 0; 433 max_nrof = 1000; // 1000 items of anything
625 enter_y = 0; 434 max_volume = 2000000; // 2m³
626} 435}
627 436
628maptile::maptile (int w, int h) 437maptile::maptile (int w, int h)
629{ 438{
630 in_memory = MAP_SWAPPED; 439 in_memory = MAP_SWAPPED;
… …
776 * This could be done in lex (like the object loader), but I think 585 * This could be done in lex (like the object loader), but I think
777 * currently, there are few enough fields this is not a big deal. 586 * currently, there are few enough fields this is not a big deal.
778 * MSW 2001-07-01 587 * MSW 2001-07-01
779 */ 588 */
780bool 589bool
781maptile::load_header (object_thawer &thawer) 590maptile::_load_header (object_thawer &thawer)
782{ 591{
783 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
784 int msgpos = 0;
785 int maplorepos = 0;
786
787 for (;;) 592 for (;;)
788 { 593 {
789 keyword kw = thawer.get_kv ();
790
791 switch (kw) 594 switch (thawer.kw)
792 { 595 {
793 case KW_EOF:
794 LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path);
795 return false;
796
797 case KW_end:
798 return true;
799
800 case KW_msg: 596 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg); 597 thawer.get_ml (KW_endmsg, msg);
802 break; 598 break;
803 599
804 case KW_lore: // CF+ extension 600 case KW_lore: // CF+ extension
… …
835 case KW_winddir: thawer.get (winddir); break; 631 case KW_winddir: thawer.get (winddir); break;
836 case KW_sky: thawer.get (sky); break; 632 case KW_sky: thawer.get (sky); break;
837 633
838 case KW_per_player: thawer.get (per_player); break; 634 case KW_per_player: thawer.get (per_player); break;
839 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;
840 637
841 case KW_region: get_region_by_name (thawer.get_str ()); break; 638 case KW_region: default_region = region::find (thawer.get_str ()); break;
842 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 639 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
843 640
844 // old names new names 641 // old names new names
845 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 642 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
846 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 643 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
855 case KW_tile_path_1: thawer.get (tile_path [0]); break; 652 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break; 653 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break; 654 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break; 655 case KW_tile_path_4: thawer.get (tile_path [3]); break;
859 656
657 case KW_ERROR:
658 set_key_text (thawer.kw_str, thawer.value);
659 break;
660
661 case KW_end:
662 thawer.next ();
663 return true;
664
860 default: 665 default:
861 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); 666 if (!thawer.parse_error ("map", 0))
667 return false;
862 break; 668 break;
863 } 669 }
670
671 thawer.next ();
864 } 672 }
865 673
866 abort (); 674 abort ();
867}
868
869bool
870maptile::load_header (const char *path)
871{
872 object_thawer thawer (path);
873
874 if (!thawer)
875 return false;
876
877 return load_header (thawer);
878} 675}
879 676
880/****************************************************************************** 677/******************************************************************************
881 * This is the start of unique map handling code 678 * This is the start of unique map handling code
882 *****************************************************************************/ 679 *****************************************************************************/
… …
893 object *above = op->above; 690 object *above = op->above;
894 691
895 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))
896 unique = 1; 693 unique = 1;
897 694
898 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 695 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
899 { 696 {
900 op->destroy_inv (false); 697 op->destroy_inv (false);
901 op->destroy (); 698 op->destroy ();
902 } 699 }
903 700
… …
905 } 702 }
906 } 703 }
907} 704}
908 705
909bool 706bool
910maptile::save_header (object_freezer &freezer) 707maptile::_save_header (object_freezer &freezer)
911{ 708{
912#define MAP_OUT(k) freezer.put (KW_ ## k, k) 709#define MAP_OUT(k) freezer.put (KW_ ## k, k)
913#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 710#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
914 711
915 MAP_OUT2 (arch, "map"); 712 MAP_OUT2 (arch, "map");
… …
917 if (name) MAP_OUT (name); 714 if (name) MAP_OUT (name);
918 MAP_OUT (swap_time); 715 MAP_OUT (swap_time);
919 MAP_OUT (reset_time); 716 MAP_OUT (reset_time);
920 MAP_OUT (reset_timeout); 717 MAP_OUT (reset_timeout);
921 MAP_OUT (fixed_resettime); 718 MAP_OUT (fixed_resettime);
719 MAP_OUT (no_reset);
922 MAP_OUT (difficulty); 720 MAP_OUT (difficulty);
923 721
924 if (region) MAP_OUT2 (region, region->name); 722 if (default_region) MAP_OUT2 (region, default_region->name);
925 723
926 if (shopitems) 724 if (shopitems)
927 { 725 {
928 char shop[MAX_BUF]; 726 char shop[MAX_BUF];
929 print_shop_string (this, shop); 727 print_shop_string (this, shop);
… …
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 755 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
958 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 756 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
959 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 757 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
960 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 758 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961 759
962 MAP_OUT2 (end, 0); 760 freezer.put (this);
761 freezer.put (KW_end);
963 762
964 return true; 763 return true;
965} 764}
966 765
967bool 766bool
968maptile::save_header (const char *path) 767maptile::_save_header (const char *path)
969{ 768{
970 object_freezer freezer; 769 object_freezer freezer;
971 770
972 if (!save_header (freezer)) 771 if (!_save_header (freezer))
973 return false; 772 return false;
974 773
975 return freezer.save (path); 774 return freezer.save (path);
976} 775}
977 776
… …
979 * Remove and free all objects in the given map. 778 * Remove and free all objects in the given map.
980 */ 779 */
981void 780void
982maptile::clear () 781maptile::clear ()
983{ 782{
984 if (!spaces) 783 if (spaces)
985 return; 784 {
986
987 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 785 for (mapspace *ms = spaces + size (); ms-- > spaces; )
988 while (object *op = ms->bot) 786 while (object *op = ms->bot)
989 { 787 {
990 if (op->head) 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
991 op = op->head; 794 if (op == op->head_ ())
992 795 {
993 op->destroy_inv (false); 796 op->destroy_inv (false);
994 op->destroy (); 797 op->destroy ();
798 }
995 } 799 }
996 800
997 sfree (spaces, size ()), spaces = 0; 801 sfree (spaces, size ()), spaces = 0;
802 }
998 803
999 if (buttons) 804 if (buttons)
1000 free_objectlinkpt (buttons), buttons = 0; 805 free_objectlinkpt (buttons), buttons = 0;
806
807 sfree (regions, size ()); regions = 0;
808 delete [] regionmap; regionmap = 0;
1001} 809}
1002 810
1003void 811void
1004maptile::clear_header () 812maptile::clear_header ()
1005{ 813{
… …
1035maptile::do_destroy () 843maptile::do_destroy ()
1036{ 844{
1037 attachable::do_destroy (); 845 attachable::do_destroy ();
1038 846
1039 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 }
1040} 915}
1041 916
1042/* 917/*
1043 * 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).
1044 */ 919 */
… …
1092 if (QUERY_FLAG (op, FLAG_GENERATOR)) 967 if (QUERY_FLAG (op, FLAG_GENERATOR))
1093 { 968 {
1094 total_exp += op->stats.exp; 969 total_exp += op->stats.exp;
1095 970
1096 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 971 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1097 total_exp += at->clone.stats.exp * 8; 972 total_exp += at->stats.exp * 8;
1098 973
1099 monster_cnt++; 974 monster_cnt++;
1100 } 975 }
1101 } 976 }
1102 977
… …
1156 */ 1031 */
1157void 1032void
1158mapspace::update_ () 1033mapspace::update_ ()
1159{ 1034{
1160 object *tmp, *last = 0; 1035 object *tmp, *last = 0;
1161 uint8 flags = 0, light = 0, anywhere = 0; 1036 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1162 New_Face *top, *floor, *middle;
1163 object *top_obj, *floor_obj, *middle_obj;
1164 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;
1165 1038
1166 middle = blank_face; 1039 //object *middle = 0;
1167 top = blank_face; 1040 //object *top = 0;
1168 floor = blank_face; 1041 //object *floor = 0;
1169 1042 // this seems to generate better code than using locals, above
1170 middle_obj = 0; 1043 object *&top = faces_obj[0] = 0;
1171 top_obj = 0; 1044 object *&middle = faces_obj[1] = 0;
1172 floor_obj = 0; 1045 object *&floor = faces_obj[2] = 0;
1173 1046
1174 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1047 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1175 { 1048 {
1176 /* This could be made additive I guess (two lights better than 1049 /* This could be made additive I guess (two lights better than
1177 * 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
… …
1190 * Always put the player down for drawing. 1063 * Always put the player down for drawing.
1191 */ 1064 */
1192 if (!tmp->invisible) 1065 if (!tmp->invisible)
1193 { 1066 {
1194 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1067 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1195 {
1196 top = tmp->face;
1197 top_obj = tmp; 1068 top = tmp;
1198 }
1199 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1069 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1200 { 1070 {
1201 /* 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,
1202 * so should not be visible, so we clear them. 1072 * so should not be visible, so we clear them.
1203 */ 1073 */
1204 middle = blank_face; 1074 middle = 0;
1205 top = blank_face; 1075 top = 0;
1206 floor = tmp->face;
1207 floor_obj = tmp; 1076 floor = tmp;
1208 } 1077 }
1209 /* Flag anywhere have high priority */ 1078 /* Flag anywhere have high priority */
1210 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1079 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1211 { 1080 {
1212 middle = tmp->face;
1213
1214 middle_obj = tmp; 1081 middle = tmp;
1215 anywhere = 1; 1082 anywhere = 1;
1216 } 1083 }
1217 /* Find the highest visible face around. If equal 1084 /* Find the highest visible face around. If equal
1218 * visibilities, we still want the one nearer to the 1085 * visibilities, we still want the one nearer to the
1219 * top 1086 * top
1220 */ 1087 */
1221 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1088 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1222 {
1223 middle = tmp->face;
1224 middle_obj = tmp; 1089 middle = tmp;
1225 }
1226 } 1090 }
1227 1091
1228 if (tmp == tmp->above) 1092 if (tmp == tmp->above)
1229 { 1093 {
1230 LOG (llevError, "Error in structure of map\n"); 1094 LOG (llevError, "Error in structure of map\n");
… …
1265 * middle face. This should not happen, as we already have the 1129 * middle face. This should not happen, as we already have the
1266 * else statement above so middle should not get set. OTOH, it 1130 * else statement above so middle should not get set. OTOH, it
1267 * 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.
1268 */ 1132 */
1269 if (top == middle) 1133 if (top == middle)
1270 middle = blank_face; 1134 middle = 0;
1271 1135
1272 /* There are three posibilities at this point: 1136 /* There are three posibilities at this point:
1273 * 1) top face is set, need middle to be set. 1137 * 1) top face is set, need middle to be set.
1274 * 2) middle is set, need to set top. 1138 * 2) middle is set, need to set top.
1275 * 3) neither middle or top is set - need to set both. 1139 * 3) neither middle or top is set - need to set both.
… …
1280 /* 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 */
1281 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1145 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1282 break; 1146 break;
1283 1147
1284 /* If two top faces are already set, quit processing */ 1148 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1149 if (top && middle)
1286 break; 1150 break;
1287 1151
1288 /* Only show visible faces, unless its the editor - show all */ 1152 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1153 if (!tmp->invisible)
1290 { 1154 {
1291 /* Fill in top if needed */ 1155 /* Fill in top if needed */
1292 if (top == blank_face) 1156 if (!top)
1293 { 1157 {
1294 top = tmp->face;
1295 top_obj = tmp; 1158 top = tmp;
1296 if (top == middle) 1159 if (top == middle)
1297 middle = blank_face; 1160 middle = 0;
1298 } 1161 }
1299 else 1162 else
1300 { 1163 {
1301 /* top is already set - we should only get here if 1164 /* top is already set - we should only get here if
1302 * middle is not set 1165 * middle is not set
1303 * 1166 *
1304 * Set the middle face and break out, since there is nothing 1167 * Set the middle face and break out, since there is nothing
1305 * more to fill in. We don't check visiblity here, since 1168 * more to fill in. We don't check visiblity here, since
1306 * 1169 *
1307 */ 1170 */
1308 if (tmp->face != top) 1171 if (tmp != top)
1309 { 1172 {
1310 middle = tmp->face;
1311 middle_obj = tmp; 1173 middle = tmp;
1312 break; 1174 break;
1313 } 1175 }
1314 } 1176 }
1315 } 1177 }
1316 } 1178 }
1317 1179
1318 if (middle == floor) 1180 if (middle == floor)
1319 middle = blank_face; 1181 middle = 0;
1320 1182
1321 if (top == middle) 1183 if (top == middle)
1322 middle = blank_face; 1184 middle = 0;
1323 1185
1324 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1186#if 0
1325 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1187 faces_obj [0] = top;
1326 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1188 faces_obj [1] = middle;
1189 faces_obj [2] = floor;
1190#endif
1327} 1191}
1328 1192
1329void 1193uint64
1330set_map_reset_time (maptile *map) 1194mapspace::volume () const
1331{ 1195{
1332 int timeout = map->reset_timeout; 1196 uint64 vol = 0;
1333 1197
1334 if (timeout <= 0) 1198 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1335 timeout = MAP_DEFAULTRESET; 1199 vol += op->volume ();
1336 if (timeout >= MAP_MAXRESET)
1337 timeout = MAP_MAXRESET;
1338 1200
1339 map->reset_time = time (0) + timeout; 1201 return vol;
1340} 1202}
1341 1203
1342/* this updates the orig_map->tile_map[tile_num] value after loading 1204bool
1343 * the map. It also takes care of linking back the freshly loaded 1205maptile::tile_available (int dir, bool load)
1344 * maps tile_map values if it tiles back to this one. It returns
1345 * the value of orig_map->tile_map[tile_num]. It really only does this
1346 * so that it is easier for calling functions to verify success.
1347 */
1348static maptile *
1349load_and_link_tiled_map (maptile *orig_map, int tile_num)
1350{ 1206{
1351 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]); 1207 if (!tile_path[dir])
1352 mp->load (); 1208 return 0;
1353 1209
1354 int dest_tile = (tile_num + 2) % 4; 1210 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1211 return 1;
1355 1212
1356 orig_map->tile_map[tile_num] = mp; 1213 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1214 return 1;
1357 1215
1358 /* need to do a strcmp here as the orig_map->path is not a shared string */
1359 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1360 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1361
1362 return mp; 1216 return 0;
1363} 1217}
1364 1218
1365/* this returns TRUE if the coordinates (x,y) are out of 1219/* this returns TRUE if the coordinates (x,y) are out of
1366 * map m. This function also takes into account any 1220 * map m. This function also takes into account any
1367 * tiling considerations, loading adjacant maps as needed. 1221 * tiling considerations, loading adjacant maps as needed.
… …
1380 if (!m) 1234 if (!m)
1381 return 0; 1235 return 0;
1382 1236
1383 if (x < 0) 1237 if (x < 0)
1384 { 1238 {
1385 if (!m->tile_path[3]) 1239 if (!m->tile_available (3))
1386 return 1; 1240 return 1;
1387 1241
1388 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1389 load_and_link_tiled_map (m, 3);
1390
1391 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);
1392 } 1243 }
1393 1244
1394 if (x >= m->width) 1245 if (x >= m->width)
1395 { 1246 {
1396 if (!m->tile_path[1]) 1247 if (!m->tile_available (1))
1397 return 1; 1248 return 1;
1398 1249
1399 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1400 load_and_link_tiled_map (m, 1);
1401
1402 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);
1403 } 1251 }
1404 1252
1405 if (y < 0) 1253 if (y < 0)
1406 { 1254 {
1407 if (!m->tile_path[0]) 1255 if (!m->tile_available (0))
1408 return 1; 1256 return 1;
1409 1257
1410 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1411 load_and_link_tiled_map (m, 0);
1412
1413 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);
1414 } 1259 }
1415 1260
1416 if (y >= m->height) 1261 if (y >= m->height)
1417 { 1262 {
1418 if (!m->tile_path[2]) 1263 if (!m->tile_available (2))
1419 return 1; 1264 return 1;
1420
1421 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1422 load_and_link_tiled_map (m, 2);
1423 1265
1424 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);
1425 } 1267 }
1426 1268
1427 /* Simple case - coordinates are within this local 1269 /* Simple case - coordinates are within this local
… …
1432 1274
1433/* This is basically the same as out_of_map above, but 1275/* This is basically the same as out_of_map above, but
1434 * instead we return NULL if no map is valid (coordinates 1276 * instead we return NULL if no map is valid (coordinates
1435 * out of bounds and no tiled map), otherwise it returns 1277 * out of bounds and no tiled map), otherwise it returns
1436 * the map as that the coordinates are really on, and 1278 * the map as that the coordinates are really on, and
1437 * updates x and y to be the localized coordinates. 1279 * updates x and y to be the localised coordinates.
1438 * Using this is more efficient of calling out_of_map 1280 * Using this is more efficient of calling out_of_map
1439 * and then figuring out what the real map is 1281 * and then figuring out what the real map is
1440 */ 1282 */
1441maptile * 1283maptile *
1442get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1284maptile::xy_find (sint16 &x, sint16 &y)
1443{ 1285{
1444 if (*x < 0) 1286 if (x < 0)
1445 { 1287 {
1446 if (!m->tile_path[3]) 1288 if (!tile_available (3))
1447 return 0; 1289 return 0;
1448 1290
1449 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1450 load_and_link_tiled_map (m, 3);
1451
1452 *x += m->tile_map[3]->width; 1291 x += tile_map[3]->width;
1453 return (get_map_from_coord (m->tile_map[3], x, y)); 1292 return tile_map[3]->xy_find (x, y);
1454 } 1293 }
1455 1294
1456 if (*x >= m->width) 1295 if (x >= width)
1457 { 1296 {
1458 if (!m->tile_path[1]) 1297 if (!tile_available (1))
1459 return 0; 1298 return 0;
1460 1299
1461 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1462 load_and_link_tiled_map (m, 1);
1463
1464 *x -= m->width; 1300 x -= width;
1465 return (get_map_from_coord (m->tile_map[1], x, y)); 1301 return tile_map[1]->xy_find (x, y);
1466 } 1302 }
1467 1303
1468 if (*y < 0) 1304 if (y < 0)
1469 { 1305 {
1470 if (!m->tile_path[0]) 1306 if (!tile_available (0))
1471 return 0; 1307 return 0;
1472 1308
1473 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1474 load_and_link_tiled_map (m, 0);
1475
1476 *y += m->tile_map[0]->height; 1309 y += tile_map[0]->height;
1477 return (get_map_from_coord (m->tile_map[0], x, y)); 1310 return tile_map[0]->xy_find (x, y);
1478 } 1311 }
1479 1312
1480 if (*y >= m->height) 1313 if (y >= height)
1481 { 1314 {
1482 if (!m->tile_path[2]) 1315 if (!tile_available (2))
1483 return 0; 1316 return 0;
1484 1317
1485 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1486 load_and_link_tiled_map (m, 2);
1487
1488 *y -= m->height; 1318 y -= height;
1489 return (get_map_from_coord (m->tile_map[2], x, y)); 1319 return tile_map[2]->xy_find (x, y);
1490 } 1320 }
1491 1321
1492 /* Simple case - coordinates are within this local 1322 /* Simple case - coordinates are within this local
1493 * map. 1323 * map.
1494 */ 1324 */
1495
1496 m->last_access = runtime;
1497 return m; 1325 return this;
1498} 1326}
1499 1327
1500/** 1328/**
1501 * Return whether map2 is adjacent to map1. If so, store the distance from 1329 * Return whether map2 is adjacent to map1. If so, store the distance from
1502 * map1 to map2 in dx/dy. 1330 * map1 to map2 in dx/dy.
1503 */ 1331 */
1504static int 1332int
1505adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1333adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1506{ 1334{
1507 if (!map1 || !map2) 1335 if (!map1 || !map2)
1508 return 0; 1336 return 0;
1509 1337
1338 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1339 //fix: compare paths instead (this is likely faster, too!)
1510 if (map1 == map2) 1340 if (map1 == map2)
1511 { 1341 {
1512 *dx = 0; 1342 *dx = 0;
1513 *dy = 0; 1343 *dy = 0;
1514 } 1344 }
… …
1574 } 1404 }
1575 else 1405 else
1576 return 0; 1406 return 0;
1577 1407
1578 return 1; 1408 return 1;
1409}
1410
1411maptile *
1412maptile::xy_load (sint16 &x, sint16 &y)
1413{
1414 maptile *map = xy_find (x, y);
1415
1416 if (map)
1417 map->load_sync ();
1418
1419 return map;
1420}
1421
1422maptile *
1423get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1424{
1425 return m->xy_load (*x, *y);
1579} 1426}
1580 1427
1581/* From map.c 1428/* From map.c
1582 * This is used by get_player to determine where the other 1429 * This is used by get_player to determine where the other
1583 * creature is. get_rangevector takes into account map tiling, 1430 * creature is. get_rangevector takes into account map tiling,
1584 * so you just can not look the the map coordinates and get the 1431 * so you just can not look the the map coordinates and get the
1585 * righte value. distance_x/y are distance away, which 1432 * righte value. distance_x/y are distance away, which
1586 * can be negativbe. direction is the crossfire direction scheme 1433 * can be negative. direction is the crossfire direction scheme
1587 * that the creature should head. part is the part of the 1434 * that the creature should head. part is the part of the
1588 * monster that is closest. 1435 * monster that is closest.
1589 * 1436 *
1590 * get_rangevector looks at op1 and op2, and fills in the 1437 * get_rangevector looks at op1 and op2, and fills in the
1591 * structure for op1 to get to op2. 1438 * structure for op1 to get to op2.
… …
1602get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1449get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1603{ 1450{
1604 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))
1605 { 1452 {
1606 /* be conservative and fill in _some_ data */ 1453 /* be conservative and fill in _some_ data */
1607 retval->distance = 100000; 1454 retval->distance = 10000;
1608 retval->distance_x = 32767; 1455 retval->distance_x = 10000;
1609 retval->distance_y = 32767; 1456 retval->distance_y = 10000;
1610 retval->direction = 0; 1457 retval->direction = 0;
1611 retval->part = 0; 1458 retval->part = 0;
1612 } 1459 }
1613 else 1460 else
1614 { 1461 {
… …
1619 1466
1620 best = op1; 1467 best = op1;
1621 /* If this is multipart, find the closest part now */ 1468 /* If this is multipart, find the closest part now */
1622 if (!(flags & 0x1) && op1->more) 1469 if (!(flags & 0x1) && op1->more)
1623 { 1470 {
1624 object *tmp;
1625 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;
1626 1472
1627 /* 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
1628 * distance instead of doing all that work above again 1474 * distance instead of doing all that work above again
1629 * since the distance fields we set above are positive in the 1475 * since the distance fields we set above are positive in the
1630 * same axis as is used for multipart objects, the simply arithmetic 1476 * same axis as is used for multipart objects, the simply arithmetic
1631 * below works. 1477 * below works.
1632 */ 1478 */
1633 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1479 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1634 { 1480 {
1635 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) +
1636 (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);
1637 if (tmpi < best_distance) 1483 if (tmpi < best_distance)
1638 { 1484 {
1639 best_distance = tmpi; 1485 best_distance = tmpi;
1640 best = tmp; 1486 best = tmp;
1641 } 1487 }
1642 } 1488 }
1489
1643 if (best != op1) 1490 if (best != op1)
1644 { 1491 {
1645 retval->distance_x += op1->x - best->x; 1492 retval->distance_x += op1->x - best->x;
1646 retval->distance_y += op1->y - best->y; 1493 retval->distance_y += op1->y - best->y;
1647 } 1494 }
1648 } 1495 }
1496
1649 retval->part = best; 1497 retval->part = best;
1650 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1498 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1651 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1499 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1652 } 1500 }
1653} 1501}
1654 1502
1655/* 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
… …
1660 * flags has no meaning for this function at this time - I kept it in to 1508 * flags has no meaning for this function at this time - I kept it in to
1661 * be more consistant with the above function and also in case they are needed 1509 * be more consistant with the above function and also in case they are needed
1662 * for something in the future. Also, since no object is pasted, the best 1510 * for something in the future. Also, since no object is pasted, the best
1663 * field of the rv_vector is set to NULL. 1511 * field of the rv_vector is set to NULL.
1664 */ 1512 */
1665
1666void 1513void
1667get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1514get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1668{ 1515{
1669 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1516 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1670 { 1517 {
1671 /* be conservative and fill in _some_ data */ 1518 /* be conservative and fill in _some_ data */
1672 retval->distance = 100000; 1519 retval->distance = 100000;
… …
1679 { 1526 {
1680 retval->distance_x += op2->x - x; 1527 retval->distance_x += op2->x - x;
1681 retval->distance_y += op2->y - y; 1528 retval->distance_y += op2->y - y;
1682 1529
1683 retval->part = NULL; 1530 retval->part = NULL;
1684 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1531 retval->distance = idistance (retval->distance_x, retval->distance_y);
1685 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1532 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1686 } 1533 }
1687} 1534}
1688 1535
1689/* Returns true of op1 and op2 are effectively on the same map 1536/* Returns true of op1 and op2 are effectively on the same map
… …
1709 op->remove (); 1556 op->remove ();
1710 1557
1711 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1558 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1712} 1559}
1713 1560
1561region *
1562maptile::region (int x, int y) const
1563{
1564 if (regions
1565 && regionmap
1566 && !OUT_OF_REAL_MAP (this, x, y))
1567 if (struct region *reg = regionmap [regions [y * width + x]])
1568 return reg;
1569
1570 if (default_region)
1571 return default_region;
1572
1573 return ::region::default_region ();
1574}
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