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.50 by root, Mon Dec 25 15:28:35 2006 UTC vs.
Revision 1.62 by root, Sun Dec 31 22:23:11 2006 UTC

19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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 at <crossfire@schmorp.de>
22*/ 22*/
23 23
24
25#include <global.h> 24#include <global.h>
26#include <funcpoint.h> 25#include <funcpoint.h>
27 26
28#include <loader.h> 27#include <loader.h>
29#include <unistd.h> 28#include <unistd.h>
30 29
31#include "path.h" 30#include "path.h"
32
33/*
34 * Returns the maptile which has a name matching the given argument.
35 * return NULL if no match is found.
36 */
37maptile *
38has_been_loaded (const char *name)
39{
40 maptile *map;
41
42 if (!name || !*name)
43 return 0;
44
45 for (map = first_map; map; map = map->next)
46 if (!strcmp (name, map->path))
47 break;
48
49 return (map);
50}
51 31
52/* 32/*
53 * This makes a path absolute outside the world of Crossfire. 33 * This makes a path absolute outside the world of Crossfire.
54 * In other words, it prepends LIBDIR/MAPDIR/ to the given path 34 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
55 * and returns the pointer to a static array containing the result. 35 * and returns the pointer to a static array containing the result.
56 * it really should be called create_mapname 36 * it really should be called create_mapname
57 */ 37 */
58
59const char * 38const char *
60create_pathname (const char *name) 39create_pathname (const char *name)
61{ 40{
62 static char buf[MAX_BUF]; 41 static char buf[8192];
63
64 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
65 * someplace else in the code? msw 2-17-97
66 */
67 if (*name == '/')
68 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
69 else
70 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name); 42 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
71 return (buf); 43 return buf;
72} 44}
73
74/*
75 * same as create_pathname, but for the overlay maps.
76 */
77
78const char *
79create_overlay_pathname (const char *name)
80{
81 static char buf[MAX_BUF];
82
83 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
84 * someplace else in the code? msw 2-17-97
85 */
86 if (*name == '/')
87 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
88 else
89 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
90 return (buf);
91}
92
93/*
94 * same as create_pathname, but for the template maps.
95 */
96
97const char *
98create_template_pathname (const char *name)
99{
100 static char buf[MAX_BUF];
101
102 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
103 * someplace else in the code? msw 2-17-97
104 */
105 if (*name == '/')
106 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
107 else
108 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
109 return (buf);
110}
111
112/*
113 * This makes absolute path to the itemfile where unique objects
114 * will be saved. Converts '/' to '@'. I think it's essier maintain
115 * files than full directory structure, but if this is problem it can
116 * be changed.
117 */
118static const char *
119create_items_path (const char *s)
120{
121 static char buf[MAX_BUF];
122 char *t;
123
124 if (*s == '/')
125 s++;
126
127 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
128
129 for (t = buf + strlen (buf); *s; s++, t++)
130 if (*s == '/')
131 *t = '@';
132 else
133 *t = *s;
134 *t = 0;
135 return (buf);
136}
137
138 45
139/* 46/*
140 * This function checks if a file with the given path exists. 47 * This function checks if a file with the given path exists.
141 * -1 is returned if it fails, otherwise the mode of the file 48 * -1 is returned if it fails, otherwise the mode of the file
142 * is returned. 49 * is returned.
149 * the rest of the code only cares that the file is readable. 56 * the rest of the code only cares that the file is readable.
150 * when the editor goes away, the call to stat should probably be 57 * when the editor goes away, the call to stat should probably be
151 * replaced by an access instead (similar to the windows one, but 58 * replaced by an access instead (similar to the windows one, but
152 * that seems to be missing the prepend_dir processing 59 * that seems to be missing the prepend_dir processing
153 */ 60 */
154
155int 61int
156check_path (const char *name, int prepend_dir) 62check_path (const char *name, int prepend_dir)
157{ 63{
158 char buf[MAX_BUF]; 64 char buf[MAX_BUF];
159 65
185 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || 91 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
186 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH)) 92 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
187 mode |= 2; 93 mode |= 2;
188 94
189 return (mode); 95 return (mode);
190}
191
192/*
193 * Prints out debug-information about a map.
194 * Dumping these at llevError doesn't seem right, but is
195 * necessary to make sure the information is in fact logged.
196 */
197
198void
199dump_map (const maptile *m)
200{
201 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
202 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y);
203
204 if (m->msg != NULL)
205 LOG (llevError, "Message:\n%s", m->msg);
206
207 if (m->maplore != NULL)
208 LOG (llevError, "Lore:\n%s", m->maplore);
209
210 if (m->tmpname != NULL)
211 LOG (llevError, "Tmpname: %s\n", m->tmpname);
212
213 LOG (llevError, "Difficulty: %d\n", m->difficulty);
214 LOG (llevError, "Darkness: %d\n", m->darkness);
215}
216
217/*
218 * Prints out debug-information about all maps.
219 * This basically just goes through all the maps and calls
220 * dump_map on each one.
221 */
222
223void
224dump_all_maps (void)
225{
226 maptile *m;
227
228 for (m = first_map; m; m = m->next)
229 dump_map (m);
230} 96}
231 97
232/* This rolls up wall, blocks_magic, blocks_view, etc, all into 98/* This rolls up wall, blocks_magic, blocks_view, etc, all into
233 * one function that just returns a P_.. value (see map.h) 99 * one function that just returns a P_.. value (see map.h)
234 * it will also do map translation for tiled maps, returning 100 * it will also do map translation for tiled maps, returning
240 * don't expect to insert/remove anything from those spaces. 106 * don't expect to insert/remove anything from those spaces.
241 */ 107 */
242int 108int
243get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) 109get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
244{ 110{
245 sint16 newx, newy;
246 int retval = 0;
247 maptile *mp;
248
249 newx = x; 111 sint16 newx = x;
250 newy = y; 112 sint16 newy = y;
251 113
252 mp = get_map_from_coord (oldmap, &newx, &newy); 114 maptile *mp = get_map_from_coord (oldmap, &newx, &newy);
253 115
254 if (!mp) 116 if (!mp)
255 return P_OUT_OF_MAP; 117 return P_OUT_OF_MAP;
256
257 if (mp != oldmap)
258 retval |= P_NEW_MAP;
259 118
260 if (newmap) *newmap = mp; 119 if (newmap) *newmap = mp;
261 if (nx) *nx = newx; 120 if (nx) *nx = newx;
262 if (ny) *ny = newy; 121 if (ny) *ny = newy;
263 122
264 return retval | mp->at (newx, newy).flags (); 123 return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
265} 124}
266 125
267/* 126/*
268 * Returns true if the given coordinate is blocked except by the 127 * Returns true if the given coordinate is blocked except by the
269 * object passed is not blocking. This is used with 128 * object passed is not blocking. This is used with
403 archetype *tmp; 262 archetype *tmp;
404 int flag; 263 int flag;
405 maptile *m1; 264 maptile *m1;
406 sint16 sx, sy; 265 sint16 sx, sy;
407 266
408 if (ob == NULL) 267 if (!ob)
409 { 268 {
410 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 269 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
411 if (flag & P_OUT_OF_MAP) 270 if (flag & P_OUT_OF_MAP)
412 return P_OUT_OF_MAP; 271 return P_OUT_OF_MAP;
413 272
423 return P_OUT_OF_MAP; 282 return P_OUT_OF_MAP;
424 if (flag & P_IS_ALIVE) 283 if (flag & P_IS_ALIVE)
425 return P_IS_ALIVE; 284 return P_IS_ALIVE;
426 285
427 mapspace &ms = m1->at (sx, sy); 286 mapspace &ms = m1->at (sx, sy);
428
429 287
430 /* find_first_free_spot() calls this function. However, often 288 /* find_first_free_spot() calls this function. However, often
431 * ob doesn't have any move type (when used to place exits) 289 * ob doesn't have any move type (when used to place exits)
432 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 290 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
433 */ 291 */
449 * into inventory, but just links them. What this does is go through 307 * into inventory, but just links them. What this does is go through
450 * and insert them properly. 308 * and insert them properly.
451 * The object 'container' is the object that contains the inventory. 309 * The object 'container' is the object that contains the inventory.
452 * This is needed so that we can update the containers weight. 310 * This is needed so that we can update the containers weight.
453 */ 311 */
454
455void 312void
456fix_container (object *container) 313fix_container (object *container)
457{ 314{
458 object *tmp = container->inv, *next; 315 object *tmp = container->inv, *next;
459 316
460 container->inv = NULL; 317 container->inv = 0;
461 while (tmp != NULL) 318 while (tmp)
462 { 319 {
463 next = tmp->below; 320 next = tmp->below;
464 if (tmp->inv) 321 if (tmp->inv)
465 fix_container (tmp); 322 fix_container (tmp);
323
466 (void) insert_ob_in_ob (tmp, container); 324 insert_ob_in_ob (tmp, container);
467 tmp = next; 325 tmp = next;
468 } 326 }
327
469 /* sum_weight will go through and calculate what all the containers are 328 /* sum_weight will go through and calculate what all the containers are
470 * carrying. 329 * carrying.
471 */ 330 */
472 sum_weight (container); 331 sum_weight (container);
473} 332}
476 * for objects whose arch says they are multipart yet according to the 335 * for objects whose arch says they are multipart yet according to the
477 * info we have, they only have the head (as would be expected when 336 * info we have, they only have the head (as would be expected when
478 * they are saved). We do have to look for the old maps that did save 337 * they are saved). We do have to look for the old maps that did save
479 * the more sections and not re-add sections for them. 338 * the more sections and not re-add sections for them.
480 */ 339 */
481 340void
482static void 341maptile::link_multipart_objects ()
483link_multipart_objects (maptile *m)
484{ 342{
485 int x, y; 343 if (!spaces)
486 object *tmp, *op, *last, *above; 344 return;
487 archetype *at;
488 345
489 for (x = 0; x < m->width; x++) 346 for (mapspace *ms = spaces + size (); ms-- > spaces; )
490 for (y = 0; y < m->height; y++) 347 for (object *tmp = ms->bot; tmp; )
491 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
492 { 348 {
493 above = tmp->above; 349 object *above = tmp->above;
494 350
495 /* already multipart - don't do anything more */ 351 /* already multipart - don't do anything more */
496 if (tmp->head || tmp->more) 352 if (!tmp->head && !tmp->more)
497 continue; 353 {
498
499 /* If there is nothing more to this object, this for loop 354 /* If there is nothing more to this object, this for loop
500 * won't do anything. 355 * won't do anything.
501 */ 356 */
502 for (at = tmp->arch->more, last = tmp; at != NULL; at = at->more, last = op) 357 archetype *at;
358 object *last, *op;
359 for (at = tmp->arch->more, last = tmp;
360 at;
361 at = at->more, last = op)
503 { 362 {
504 op = arch_to_object (at); 363 op = arch_to_object (at);
505 364
506 /* update x,y coordinates */ 365 /* update x,y coordinates */
507 op->x += tmp->x; 366 op->x += tmp->x;
508 op->y += tmp->y; 367 op->y += tmp->y;
509 op->head = tmp; 368 op->head = tmp;
510 op->map = m; 369 op->map = this;
511 last->more = op; 370 last->more = op;
512 op->name = tmp->name; 371 op->name = tmp->name;
513 op->title = tmp->title; 372 op->title = tmp->title;
373
514 /* we could link all the parts onto tmp, and then just 374 /* we could link all the parts onto tmp, and then just
515 * call insert_ob_in_map once, but the effect is the same, 375 * call insert_ob_in_map once, but the effect is the same,
516 * as insert_ob_in_map will call itself with each part, and 376 * as insert_ob_in_map will call itself with each part, and
517 * the coding is simpler to just to it here with each part. 377 * the coding is simpler to just to it here with each part.
518 */ 378 */
519 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 379 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
520 } /* for at = tmp->arch->more */ 380 }
521 } /* for objects on this space */ 381 }
382
383 tmp = above;
384 }
522} 385}
523 386
524/* 387/*
525 * Loads (ands parses) the objects into a given map from the specified 388 * Loads (ands parses) the objects into a given map from the specified
526 * file pointer. 389 * file pointer.
527 * mapflags is the same as we get with load_original_map 390 * mapflags is the same as we get with load_original_map
528 */ 391 */
529void 392bool
530load_objects (maptile *m, object_thawer & fp, int mapflags) 393maptile::load_objects (object_thawer &thawer)
531{ 394{
532 int i, j;
533 int unique; 395 int unique;
534 object *op, *prev = NULL, *last_more = NULL, *otmp; 396 object *op, *prev = NULL, *last_more = NULL, *otmp;
535 397
536 op = object::create (); 398 op = object::create ();
537 op->map = m; /* To handle buttons correctly */ 399 op->map = this; /* To handle buttons correctly */
538 400
539 while ((i = load_object (fp, op, mapflags))) 401 while (int i = load_object (thawer, op, 0))
540 { 402 {
541 /* if the archetype for the object is null, means that we 403 /* if the archetype for the object is null, means that we
542 * got an invalid object. Don't do anything with it - the game 404 * got an invalid object. Don't do anything with it - the game
543 * or editor will not be able to do anything with it either. 405 * or editor will not be able to do anything with it either.
544 */ 406 */
549 } 411 }
550 412
551 switch (i) 413 switch (i)
552 { 414 {
553 case LL_NORMAL: 415 case LL_NORMAL:
554 /* if we are loading an overlay, put the floors on the bottom */
555 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
556 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
557 else
558 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 416 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
559 417
560 if (op->inv) 418 if (op->inv)
561 sum_weight (op); 419 sum_weight (op);
562 420
563 prev = op, last_more = op; 421 prev = op, last_more = op;
564 break; 422 break;
565 423
566 case LL_MORE: 424 case LL_MORE:
567 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 425 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
568 op->head = prev, last_more->more = op, last_more = op; 426 op->head = prev, last_more->more = op, last_more = op;
569 break; 427 break;
570 } 428 }
571 429
572 if (mapflags & MAP_STYLE)
573 remove_from_active_list (op);
574
575 op = object::create (); 430 op = object::create ();
576 op->map = m; 431 op->map = this;
577 }
578
579 for (i = 0; i < m->width; i++)
580 {
581 for (j = 0; j < m->height; j++)
582 {
583 unique = 0;
584 /* check for unique items, or unique squares */
585 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
586 {
587 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
588 unique = 1;
589
590 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
591 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
592 }
593 }
594 } 432 }
595 433
596 op->destroy (); 434 op->destroy ();
597 link_multipart_objects (m);
598}
599 435
600/* This saves all the objects on the map in a non destructive fashion. 436#if 0
601 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
602 * and we only save the head of multi part objects - this is needed
603 * in order to do map tiling properly.
604 */
605void
606save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag)
607{
608 int i, j = 0, unique = 0;
609 object *op;
610
611 /* first pass - save one-part objects */
612 for (i = 0; i < m->width; i++) 437 for (i = 0; i < width; i++)
613 for (j = 0; j < m->height; j++) 438 for (j = 0; j < height; j++)
614 { 439 {
615 unique = 0; 440 unique = 0;
616 for (op = m->at (i, j).bot; op; op = op->above) 441 /* check for unique items, or unique squares */
442 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
617 { 443 {
618 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE]) 444 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
619 unique = 1; 445 unique = 1;
620 446
621 if (op->type == PLAYER) 447 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
622 continue; 448 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
623
624 if (op->head || op->owner)
625 continue;
626
627 if (unique || op->flag [FLAG_UNIQUE])
628 save_object (fp2, op, 3);
629 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
630 save_object (fp, op, 3);
631 } 449 }
632 } 450 }
451#endif
452
453 return true;
454}
455
456void
457maptile::activate ()
458{
459 if (!spaces)
460 return;
461
462 for (mapspace *ms = spaces + size (); ms-- > spaces; )
463 for (object *op = ms->bot; op; op = op->above)
464 op->activate_recursive ();
465}
466
467void
468maptile::deactivate ()
469{
470 if (!spaces)
471 return;
472
473 for (mapspace *ms = spaces + size (); ms-- > spaces; )
474 for (object *op = ms->bot; op; op = op->above)
475 op->deactivate_recursive ();
476}
477
478bool
479maptile::save_objects (object_freezer &freezer, int flags)
480{
481 if (flags & IO_HEADER)
482 save_header (freezer);
483
484 if (!spaces)
485 return false;
486
487 for (int i = 0; i < size (); ++i)
488 {
489 int unique = 0;
490 for (object *op = spaces [i].bot; op; op = op->above)
491 {
492 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
493 unique = 1;
494
495 if (!op->can_map_save ())
496 continue;
497
498 if (unique || op->flag [FLAG_UNIQUE])
499 {
500 if (flags & IO_UNIQUES)
501 save_object (freezer, op, 1);
502 }
503 else if (flags & IO_OBJECTS)
504 save_object (freezer, op, 1);
505 }
506 }
507
508 return true;
509}
510
511bool
512maptile::load_objects (const char *path, bool skip_header)
513{
514 object_thawer thawer (path);
515
516 if (!thawer)
517 return false;
518
519 if (skip_header)
520 for (;;)
521 {
522 keyword kw = thawer.get_kv ();
523
524 if (kw == KW_end)
525 break;
526
527 thawer.skip_kv (kw);
528 }
529
530 return load_objects (thawer);
531}
532
533bool
534maptile::save_objects (const char *path, int flags)
535{
536 object_freezer freezer;
537
538 if (!save_objects (freezer, flags))
539 return false;
540
541 return freezer.save (path);
633} 542}
634 543
635maptile::maptile () 544maptile::maptile ()
636{ 545{
637 in_memory = MAP_SWAPPED; 546 in_memory = MAP_SWAPPED;
547
638 /* The maps used to pick up default x and y values from the 548 /* The maps used to pick up default x and y values from the
639 * map archetype. Mimic that behaviour. 549 * map archetype. Mimic that behaviour.
640 */ 550 */
641 this->width = 16; 551 width = 16;
642 this->height = 16; 552 height = 16;
643 this->reset_timeout = 0; 553 reset_timeout = 0;
644 this->timeout = 300; 554 timeout = 300;
645 this->enter_x = 0; 555 enter_x = 0;
646 this->enter_y = 0; 556 enter_y = 0;
647 /*set part to -1 indicating conversion to weather map not yet done */
648 this->worldpartx = -1;
649 this->worldparty = -1;
650} 557}
651 558
652/* 559maptile::maptile (int w, int h)
653 * Allocates, initialises, and returns a pointer to a maptile.
654 * Modified to no longer take a path option which was not being
655 * used anyways. MSW 2001-07-01
656 */
657maptile *
658get_linked_map (void)
659{ 560{
660 maptile *mp, *map = new maptile; 561 in_memory = MAP_SWAPPED;
661 562
662 for (mp = first_map; mp && mp->next; mp = mp->next); 563 width = w;
564 height = h;
565 reset_timeout = 0;
566 timeout = 300;
567 enter_x = 0;
568 enter_y = 0;
663 569
664 if (mp == NULL) 570 alloc ();
665 first_map = map;
666 else
667 mp->next = map;
668
669 return map;
670} 571}
671 572
672/* 573/*
673 * Allocates the arrays contained in a maptile. 574 * Allocates the arrays contained in a maptile.
674 * This basically allocates the dynamic array of spaces for the 575 * This basically allocates the dynamic array of spaces for the
675 * map. 576 * map.
676 */ 577 */
677void 578void
678maptile::allocate () 579maptile::alloc ()
679{ 580{
680 in_memory = MAP_IN_MEMORY;
681
682 /* Log this condition and free the storage. We could I suppose
683 * realloc, but if the caller is presuming the data will be intact,
684 * that is their poor assumption.
685 */
686 if (spaces) 581 if (spaces)
687 {
688 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
689 free (spaces);
690 }
691
692 spaces = (mapspace *)
693 calloc (1, width * height * sizeof (mapspace));
694
695 if (!spaces)
696 fatal (OUT_OF_MEMORY);
697}
698
699/* Create and returns a map of the specific size. Used
700 * in random map code and the editor.
701 */
702maptile *
703get_empty_map (int sizex, int sizey)
704{
705 maptile *m = get_linked_map ();
706
707 m->width = sizex;
708 m->height = sizey;
709 m->in_memory = MAP_SWAPPED;
710 m->allocate ();
711
712 return m; 582 return;
583
584 spaces = salloc0<mapspace> (size ());
713} 585}
714 586
715/* Takes a string from a map definition and outputs a pointer to the array of shopitems 587/* Takes a string from a map definition and outputs a pointer to the array of shopitems
716 * corresponding to that string. Memory is allocated for this, it must be freed 588 * corresponding to that string. Memory is allocated for this, it must be freed
717 * at a later date. 589 * at a later date.
718 * Called by parse_map_headers below. 590 * Called by parse_map_headers below.
719 */ 591 */
720
721static shopitems * 592static shopitems *
722parse_shop_string (const char *input_string) 593parse_shop_string (const char *input_string)
723{ 594{
724 char *shop_string, *p, *q, *next_semicolon, *next_colon; 595 char *shop_string, *p, *q, *next_semicolon, *next_colon;
725 shopitems *items = NULL; 596 shopitems *items = NULL;
734 p = strchr (p, ';'); 605 p = strchr (p, ';');
735 number_of_entries++; 606 number_of_entries++;
736 if (p) 607 if (p)
737 p++; 608 p++;
738 } 609 }
610
739 p = shop_string; 611 p = shop_string;
740 strip_endline (p); 612 strip_endline (p);
741 items = new shopitems[number_of_entries + 1]; 613 items = new shopitems[number_of_entries + 1];
742 for (i = 0; i < number_of_entries; i++) 614 for (i = 0; i < number_of_entries; i++)
743 { 615 {
744 if (!p) 616 if (!p)
745 { 617 {
746 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); 618 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
747 break; 619 break;
748 } 620 }
621
749 next_semicolon = strchr (p, ';'); 622 next_semicolon = strchr (p, ';');
750 next_colon = strchr (p, ':'); 623 next_colon = strchr (p, ':');
751 /* if there is a stregth specified, figure out what it is, we'll need it soon. */ 624 /* if there is a stregth specified, figure out what it is, we'll need it soon. */
752 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 625 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
753 items[i].strength = atoi (strchr (p, ':') + 1); 626 items[i].strength = atoi (strchr (p, ':') + 1);
780 * the next entry while we're at it, better print a warning 653 * the next entry while we're at it, better print a warning
781 */ 654 */
782 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); 655 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
783 } 656 }
784 } 657 }
658
785 items[i].index = number_of_entries; 659 items[i].index = number_of_entries;
786 if (next_semicolon) 660 if (next_semicolon)
787 p = ++next_semicolon; 661 p = ++next_semicolon;
788 else 662 else
789 p = NULL; 663 p = NULL;
790 } 664 }
665
791 free (shop_string); 666 free (shop_string);
792 return items; 667 return items;
793} 668}
794 669
795/* opposite of parse string, this puts the string that was originally fed in to 670/* opposite of parse string, this puts the string that was originally fed in to
804 for (i = 0; i < m->shopitems[0].index; i++) 679 for (i = 0; i < m->shopitems[0].index; i++)
805 { 680 {
806 if (m->shopitems[i].typenum) 681 if (m->shopitems[i].typenum)
807 { 682 {
808 if (m->shopitems[i].strength) 683 if (m->shopitems[i].strength)
809 {
810 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 684 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
811 }
812 else 685 else
813 sprintf (tmp, "%s;", m->shopitems[i].name); 686 sprintf (tmp, "%s;", m->shopitems[i].name);
814 } 687 }
815 else 688 else
816 { 689 {
817 if (m->shopitems[i].strength) 690 if (m->shopitems[i].strength)
818 {
819 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 691 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
820 }
821 else 692 else
822 sprintf (tmp, "*"); 693 sprintf (tmp, "*");
823 } 694 }
695
824 strcat (output_string, tmp); 696 strcat (output_string, tmp);
825 } 697 }
826} 698}
827 699
828/* This loads the header information of the map. The header 700/* This loads the header information of the map. The header
833 * put all the stuff in the map object so that names actually make 705 * put all the stuff in the map object so that names actually make
834 * sense. 706 * sense.
835 * This could be done in lex (like the object loader), but I think 707 * This could be done in lex (like the object loader), but I think
836 * currently, there are few enough fields this is not a big deal. 708 * currently, there are few enough fields this is not a big deal.
837 * MSW 2001-07-01 709 * MSW 2001-07-01
838 * return 0 on success, 1 on failure.
839 */ 710 */
840 711bool
841static int 712maptile::load_header (object_thawer &thawer)
842load_map_header (object_thawer & fp, maptile *m)
843{ 713{
844 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; 714 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
845 int msgpos = 0; 715 int msgpos = 0;
846 int maplorepos = 0; 716 int maplorepos = 0;
847 717
848 while (fgets (buf, HUGE_BUF, fp) != NULL) 718 for (;;)
849 { 719 {
850 buf[HUGE_BUF - 1] = 0; 720 keyword kw = thawer.get_kv ();
851 key = buf;
852 721
853 while (isspace (*key)) 722 switch (kw)
854 key++;
855
856 if (*key == 0)
857 continue; /* empty line */
858
859 value = strchr (key, ' ');
860
861 if (!value)
862 { 723 {
863 if ((end = strchr (key, '\n'))) 724 case KW_EOF:
864 *end = 0; 725 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
726 return false;
727
728 case KW_end:
729 return true;
730
731 case KW_msg:
732 thawer.get_ml (KW_endmsg, msg);
733 break;
734
735 case KW_lore: // CF+ extension
736 thawer.get_ml (KW_endlore, maplore);
737 break;
738
739 case KW_maplore:
740 thawer.get_ml (KW_endmaplore, maplore);
741 break;
742
743 case KW_arch:
744 if (strcmp (thawer.get_str (), "map"))
745 LOG (llevError, "%s: loading map and got a non 'arch map' line (arch %s), skipping.\n", &path, thawer.get_str ());
746 break;
747
748 case KW_oid:
749 thawer.get (this, thawer.get_sint32 ());
750 break;
751
752 case KW_file_format_version: break; // nop
753
754 case KW_name: thawer.get (name); break;
755 case KW_attach: thawer.get (attach); break;
756 case KW_reset_time: thawer.get (reset_time); break;
757 case KW_shopgreed: thawer.get (shopgreed); break;
758 case KW_shopmin: thawer.get (shopmin); break;
759 case KW_shopmax: thawer.get (shopmax); break;
760 case KW_shoprace: thawer.get (shoprace); break;
761 case KW_outdoor: thawer.get (outdoor); break;
762 case KW_temp: thawer.get (temp); break;
763 case KW_pressure: thawer.get (pressure); break;
764 case KW_humid: thawer.get (humid); break;
765 case KW_windspeed: thawer.get (windspeed); break;
766 case KW_winddir: thawer.get (winddir); break;
767 case KW_sky: thawer.get (sky); break;
768
769 case KW_per_player: thawer.get (per_player); break;
770 case KW_per_party: thawer.get (per_party); break;
771
772 case KW_region: get_region_by_name (thawer.get_str ()); break;
773 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
774
775 // old names new names
776 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
777 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
778 case KW_x: case KW_width: thawer.get (width); break;
779 case KW_y: case KW_height: thawer.get (height); break;
780 case KW_weight: case KW_reset_timeout: thawer.get (reset_timeout); break;
781 case KW_value: case KW_swap_time: thawer.get (timeout); break;
782 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
783 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
784 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
785
786 case KW_tile_path_1: thawer.get (tile_path [0]); break;
787 case KW_tile_path_2: thawer.get (tile_path [1]); break;
788 case KW_tile_path_3: thawer.get (tile_path [2]); break;
789 case KW_tile_path_4: thawer.get (tile_path [3]); break;
790
791 default:
792 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
793 break;
865 } 794 }
866 else
867 {
868 *value = 0;
869 value++;
870 end = strchr (value, '\n');
871
872 while (isspace (*value))
873 {
874 value++;
875
876 if (*value == '\0' || value == end)
877 {
878 /* Nothing but spaces. */
879 value = NULL;
880 break;
881 }
882 }
883 }
884
885 if (!end)
886 {
887 LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
888 return 1;
889 }
890
891 /* key is the field name, value is what it should be set
892 * to. We've already done the work to null terminate key,
893 * and strip off any leading spaces for both of these.
894 * We have not touched the newline at the end of the line -
895 * these are needed for some values. the end pointer
896 * points to the first of the newlines.
897 * value could be NULL! It would be easy enough to just point
898 * this to "" to prevent cores, but that would let more errors slide
899 * through.
900 *
901 * First check for entries that do not use the value parameter, then
902 * validate that value is given and check for the remaining entries
903 * that use the parameter.
904 */
905
906 if (!strcmp (key, "msg"))
907 {
908 while (fgets (buf, HUGE_BUF, fp) != NULL)
909 {
910 if (!strcmp (buf, "endmsg\n"))
911 break;
912 else
913 {
914 /* slightly more efficient than strcat */
915 strcpy (msgbuf + msgpos, buf);
916 msgpos += strlen (buf);
917 }
918 }
919 /* There are lots of maps that have empty messages (eg, msg/endmsg
920 * with nothing between). There is no reason in those cases to
921 * keep the empty message. Also, msgbuf contains garbage data
922 * when msgpos is zero, so copying it results in crashes
923 */
924 if (msgpos != 0)
925 m->msg = strdup (msgbuf);
926 }
927 else if (!strcmp (key, "maplore"))
928 {
929 while (fgets (buf, HUGE_BUF, fp) != NULL)
930 {
931 if (!strcmp (buf, "endmaplore\n"))
932 break;
933 else
934 {
935 /* slightly more efficient than strcat */
936 strcpy (maplorebuf + maplorepos, buf);
937 maplorepos += strlen (buf);
938 }
939 }
940 if (maplorepos != 0)
941 m->maplore = strdup (maplorebuf);
942 }
943 else if (!strcmp (key, "end"))
944 {
945 break;
946 }
947 else if (value == NULL)
948 {
949 LOG (llevError, "Got '%s' line without parameter in map header\n", key);
950 }
951 else if (!strcmp (key, "arch"))
952 {
953 /* This is an oddity, but not something we care about much. */
954 if (strcmp (value, "map\n"))
955 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
956 }
957 else if (!strcmp (key, "name"))
958 {
959 *end = 0;
960 m->name = strdup (value);
961 }
962 /* first strcmp value on these are old names supported
963 * for compatibility reasons. The new values (second) are
964 * what really should be used.
965 */
966 else if (!strcmp (key, "oid"))
967 fp.get (m, atoi (value));
968 else if (!strcmp (key, "attach"))
969 m->attach = value;
970 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
971 m->enter_x = atoi (value);
972 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
973 m->enter_y = atoi (value);
974 else if (!strcmp (key, "x") || !strcmp (key, "width"))
975 m->width = atoi (value);
976 else if (!strcmp (key, "y") || !strcmp (key, "height"))
977 m->height = atoi (value);
978 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
979 m->reset_timeout = atoi (value);
980 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
981 m->timeout = atoi (value);
982 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
983 m->difficulty = clamp (atoi (value), 1, settings.max_level);
984 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
985 m->darkness = atoi (value);
986 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
987 m->fixed_resettime = atoi (value);
988 else if (!strcmp (key, "unique"))
989 m->unique = atoi (value);
990 else if (!strcmp (key, "template"))
991 m->templatemap = atoi (value);
992 else if (!strcmp (key, "region"))
993 m->region = get_region_by_name (value);
994 else if (!strcmp (key, "shopitems"))
995 {
996 *end = 0;
997 m->shopitems = parse_shop_string (value);
998 }
999 else if (!strcmp (key, "shopgreed"))
1000 m->shopgreed = atof (value);
1001 else if (!strcmp (key, "shopmin"))
1002 m->shopmin = atol (value);
1003 else if (!strcmp (key, "shopmax"))
1004 m->shopmax = atol (value);
1005 else if (!strcmp (key, "shoprace"))
1006 {
1007 *end = 0;
1008 m->shoprace = strdup (value);
1009 }
1010 else if (!strcmp (key, "outdoor"))
1011 m->outdoor = atoi (value);
1012 else if (!strcmp (key, "temp"))
1013 m->temp = atoi (value);
1014 else if (!strcmp (key, "pressure"))
1015 m->pressure = atoi (value);
1016 else if (!strcmp (key, "humid"))
1017 m->humid = atoi (value);
1018 else if (!strcmp (key, "windspeed"))
1019 m->windspeed = atoi (value);
1020 else if (!strcmp (key, "winddir"))
1021 m->winddir = atoi (value);
1022 else if (!strcmp (key, "sky"))
1023 m->sky = atoi (value);
1024 else if (!strcmp (key, "nosmooth"))
1025 m->nosmooth = atoi (value);
1026 else if (!strncmp (key, "tile_path_", 10))
1027 {
1028 int tile = atoi (key + 10);
1029
1030 if (tile < 1 || tile > 4)
1031 {
1032 LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
1033 }
1034 else
1035 {
1036 char *path;
1037
1038 *end = 0;
1039
1040 if (m->tile_path[tile - 1])
1041 {
1042 LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
1043 free (m->tile_path[tile - 1]);
1044 m->tile_path[tile - 1] = NULL;
1045 }
1046
1047 if (check_path (value, 1) != -1)
1048 {
1049 /* The unadorned path works. */
1050 path = value;
1051 }
1052 else
1053 {
1054 /* Try again; it could be a relative exit. */
1055
1056 path = path_combine_and_normalize (m->path, value);
1057
1058 if (check_path (path, 1) == -1)
1059 {
1060 LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
1061 path = NULL;
1062 }
1063 }
1064
1065 if (editor)
1066 {
1067 /* Use the value as in the file. */
1068 m->tile_path[tile - 1] = strdup (value);
1069 }
1070 else if (path != NULL)
1071 {
1072 /* Use the normalized value. */
1073 m->tile_path[tile - 1] = strdup (path);
1074 }
1075 } /* end if tile direction (in)valid */
1076 }
1077 else
1078 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1079 }
1080
1081 if (!key || strcmp (key, "end"))
1082 { 795 }
1083 LOG (llevError, "Got premature eof on map header!\n");
1084 return 1;
1085 }
1086 796
1087 return 0; 797 abort ();
1088} 798}
1089 799
1090/* 800bool
1091 * Opens the file "filename" and reads information about the map 801maptile::load_header (const char *path)
1092 * from the given file, and stores it in a newly allocated
1093 * maptile. A pointer to this structure is returned, or NULL on failure.
1094 * flags correspond to those in map.h. Main ones used are
1095 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1096 * MAP_BLOCK, in which case we block on this load. This happens in all
1097 * cases, no matter if this flag is set or not.
1098 * MAP_STYLE: style map - don't add active objects, don't add to server
1099 * managed map list.
1100 */
1101
1102maptile *
1103load_original_map (const char *filename, int flags)
1104{ 802{
1105 maptile *m;
1106 char pathname[MAX_BUF];
1107
1108 if (flags & MAP_PLAYER_UNIQUE)
1109 strcpy (pathname, filename);
1110 else if (flags & MAP_OVERLAY)
1111 strcpy (pathname, create_overlay_pathname (filename));
1112 else
1113 strcpy (pathname, create_pathname (filename));
1114
1115 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1116
1117 object_thawer thawer (pathname); 803 object_thawer thawer (path);
1118 804
1119 if (!thawer) 805 if (!thawer)
1120 return 0; 806 return false;
1121 807
1122 m = get_linked_map (); 808 return load_header (thawer);
1123
1124 strcpy (m->path, filename);
1125 if (load_map_header (thawer, m))
1126 {
1127 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1128 delete_map (m);
1129 return 0;
1130 }
1131
1132 m->allocate ();
1133
1134 m->in_memory = MAP_LOADING;
1135 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1136
1137 m->in_memory = MAP_IN_MEMORY;
1138 if (!m->difficulty)
1139 m->difficulty = calculate_difficulty (m);
1140 set_map_reset_time (m);
1141 m->instantiate ();
1142 return (m);
1143}
1144
1145/*
1146 * Loads a map, which has been loaded earlier, from file.
1147 * Return the map object we load into (this can change from the passed
1148 * option if we can't find the original map)
1149 */
1150
1151static maptile *
1152load_temporary_map (maptile *m)
1153{
1154 char buf[MAX_BUF];
1155
1156 if (!m->tmpname)
1157 {
1158 LOG (llevError, "No temporary filename for map %s\n", m->path);
1159 strcpy (buf, m->path);
1160 delete_map (m);
1161 m = load_original_map (buf, 0);
1162 if (m == NULL)
1163 return NULL;
1164 fix_auto_apply (m); /* Chests which open as default */
1165 return m;
1166 }
1167
1168 object_thawer thawer (m->tmpname);
1169
1170 if (!thawer)
1171 {
1172 strcpy (buf, m->path);
1173 delete_map (m);
1174 m = load_original_map (buf, 0);
1175 if (!m)
1176 return NULL;
1177 fix_auto_apply (m); /* Chests which open as default */
1178 return m;
1179 }
1180
1181 if (load_map_header (thawer, m))
1182 {
1183 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1184 delete_map (m);
1185 m = load_original_map (m->path, 0);
1186 return NULL;
1187 }
1188
1189 m->allocate ();
1190
1191 m->in_memory = MAP_LOADING;
1192 load_objects (m, thawer, 0);
1193
1194 m->in_memory = MAP_IN_MEMORY;
1195 INVOKE_MAP (SWAPIN, m);
1196 return m;
1197}
1198
1199/*
1200 * Loads a map, which has been loaded earlier, from file.
1201 * Return the map object we load into (this can change from the passed
1202 * option if we can't find the original map)
1203 */
1204
1205maptile *
1206load_overlay_map (const char *filename, maptile *m)
1207{
1208 char pathname[MAX_BUF];
1209
1210 strcpy (pathname, create_overlay_pathname (filename));
1211
1212 object_thawer thawer (pathname);
1213
1214 if (!thawer)
1215 return m;
1216
1217 if (load_map_header (thawer, m))
1218 {
1219 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1220 delete_map (m);
1221 m = load_original_map (m->path, 0);
1222 return 0;
1223 }
1224 /*m->allocate ();*/
1225
1226 m->in_memory = MAP_LOADING;
1227 load_objects (m, thawer, MAP_OVERLAY);
1228
1229 m->in_memory = MAP_IN_MEMORY;
1230 return m;
1231} 809}
1232 810
1233/****************************************************************************** 811/******************************************************************************
1234 * This is the start of unique map handling code 812 * This is the start of unique map handling code
1235 *****************************************************************************/ 813 *****************************************************************************/
1236 814
1237/* This goes through map 'm' and removed any unique items on the map. */ 815/* This goes through the maptile and removed any unique items on the map. */
1238static void 816void
1239delete_unique_items (maptile *m) 817maptile::clear_unique_items ()
1240{ 818{
1241 int i, j, unique; 819 for (int i = 0; i < size (); ++i)
1242 object *op, *next;
1243
1244 for (i = 0; i < m->width; i++)
1245 for (j = 0; j < m->height; j++)
1246 { 820 {
1247 unique = 0; 821 int unique = 0;
1248 822 for (object *op = spaces [i].bot; op; )
1249 for (op = GET_MAP_OB (m, i, j); op; op = next)
1250 { 823 {
1251 next = op->above; 824 object *above = op->above;
1252 825
1253 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 826 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1254 unique = 1; 827 unique = 1;
1255 828
1256 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 829 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1257 { 830 {
1258 op->destroy_inv (false); 831 op->destroy_inv (false);
1259 op->destroy (); 832 op->destroy ();
1260 } 833 }
1261 }
1262 }
1263}
1264 834
1265 835 op = above;
1266/*
1267 * Loads unique objects from file(s) into the map which is in memory
1268 * m is the map to load unique items into.
1269 */
1270static void
1271load_unique_objects (maptile *m)
1272{
1273 int count;
1274 char firstname[MAX_BUF];
1275
1276 for (count = 0; count < 10; count++)
1277 {
1278 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1279 if (!access (firstname, R_OK))
1280 break;
1281 }
1282 /* If we get here, we did not find any map */
1283 if (count == 10)
1284 return;
1285
1286 object_thawer thawer (firstname);
1287
1288 if (!thawer)
1289 return;
1290
1291 m->in_memory = MAP_LOADING;
1292 if (m->tmpname == NULL) /* if we have loaded unique items from */
1293 delete_unique_items (m); /* original map before, don't duplicate them */
1294
1295 load_objects (m, thawer, 0);
1296
1297 m->in_memory = MAP_IN_MEMORY;
1298}
1299
1300/*
1301 * Saves a map to file. If flag is set, it is saved into the same
1302 * file it was (originally) loaded from. Otherwise a temporary
1303 * filename will be genarated, and the file will be stored there.
1304 * The temporary filename will be stored in the maptileure.
1305 * If the map is unique, we also save to the filename in the map
1306 * (this should have been updated when first loaded)
1307 */
1308int
1309new_save_map (maptile *m, int flag)
1310{
1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1312 int i;
1313
1314 if (flag && !*m->path)
1315 {
1316 LOG (llevError, "Tried to save map without path.\n");
1317 return -1;
1318 }
1319
1320 if (flag || (m->unique) || (m->templatemap))
1321 {
1322 if (!m->unique && !m->templatemap)
1323 { /* flag is set */
1324 if (flag == 2)
1325 strcpy (filename, create_overlay_pathname (m->path));
1326 else
1327 strcpy (filename, create_pathname (m->path));
1328 } 836 }
1329 else
1330 strcpy (filename, m->path);
1331
1332 make_path_to_file (filename);
1333 }
1334 else
1335 { 837 }
1336 if (!m->tmpname) 838}
1337 m->tmpname = tempnam (settings.tmpdir, NULL);
1338 839
1339 strcpy (filename, m->tmpname); 840bool
841maptile::save_header (object_freezer &freezer)
842{
843#define MAP_OUT(k) freezer.put (KW_ ## k, k)
844#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
845
846 MAP_OUT2 (arch, "map");
847
848 if (name) MAP_OUT (name);
849 MAP_OUT (swap_time);
850 MAP_OUT (reset_time);
851 MAP_OUT (reset_timeout);
852 MAP_OUT (fixed_resettime);
853 MAP_OUT (difficulty);
854
855 if (region) MAP_OUT2 (region, region->name);
856
857 if (shopitems)
1340 } 858 {
859 char shop[MAX_BUF];
860 print_shop_string (this, shop);
861 MAP_OUT2 (shopitems, shop);
862 }
1341 863
1342 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 864 MAP_OUT (shopgreed);
1343 m->in_memory = MAP_SAVING; 865 MAP_OUT (shopmin);
866 MAP_OUT (shopmax);
867 if (shoprace) MAP_OUT (shoprace);
868 MAP_OUT (darkness);
869 MAP_OUT (width);
870 MAP_OUT (height);
871 MAP_OUT (enter_x);
872 MAP_OUT (enter_y);
1344 873
874 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
875 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
876
877 MAP_OUT (outdoor);
878 MAP_OUT (temp);
879 MAP_OUT (pressure);
880 MAP_OUT (humid);
881 MAP_OUT (windspeed);
882 MAP_OUT (winddir);
883 MAP_OUT (sky);
884
885 MAP_OUT (per_player);
886 MAP_OUT (per_party);
887
888 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
889 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
890 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
891 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
892
893 freezer.put (KW_end);
894
895 return true;
896}
897
898bool
899maptile::save_header (const char *path)
900{
1345 object_freezer freezer; 901 object_freezer freezer;
1346 902
1347 /* legacy */ 903 if (!save_header (freezer))
1348 fprintf (freezer, "arch map\n"); 904 return false;
1349 if (m->name)
1350 fprintf (freezer, "name %s\n", m->name);
1351 if (!flag)
1352 fprintf (freezer, "swap_time %d\n", m->swap_time);
1353 if (m->reset_timeout)
1354 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1355 if (m->fixed_resettime)
1356 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1357 /* we unfortunately have no idea if this is a value the creator set
1358 * or a difficulty value we generated when the map was first loaded
1359 */
1360 if (m->difficulty)
1361 fprintf (freezer, "difficulty %d\n", m->difficulty);
1362 if (m->region)
1363 fprintf (freezer, "region %s\n", m->region->name);
1364 if (m->shopitems)
1365 {
1366 print_shop_string (m, shop);
1367 fprintf (freezer, "shopitems %s\n", shop);
1368 }
1369 if (m->shopgreed)
1370 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1371 if (m->shopmin)
1372 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1373 if (m->shopmax)
1374 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1375 if (m->shoprace)
1376 fprintf (freezer, "shoprace %s\n", m->shoprace);
1377 if (m->darkness)
1378 fprintf (freezer, "darkness %d\n", m->darkness);
1379 if (m->width)
1380 fprintf (freezer, "width %d\n", m->width);
1381 if (m->height)
1382 fprintf (freezer, "height %d\n", m->height);
1383 if (m->enter_x)
1384 fprintf (freezer, "enter_x %d\n", m->enter_x);
1385 if (m->enter_y)
1386 fprintf (freezer, "enter_y %d\n", m->enter_y);
1387 if (m->msg)
1388 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1389 if (m->maplore)
1390 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1391 if (m->unique)
1392 fprintf (freezer, "unique %d\n", m->unique);
1393 if (m->templatemap)
1394 fprintf (freezer, "template %d\n", m->templatemap);
1395 if (m->outdoor)
1396 fprintf (freezer, "outdoor %d\n", m->outdoor);
1397 if (m->temp)
1398 fprintf (freezer, "temp %d\n", m->temp);
1399 if (m->pressure)
1400 fprintf (freezer, "pressure %d\n", m->pressure);
1401 if (m->humid)
1402 fprintf (freezer, "humid %d\n", m->humid);
1403 if (m->windspeed)
1404 fprintf (freezer, "windspeed %d\n", m->windspeed);
1405 if (m->winddir)
1406 fprintf (freezer, "winddir %d\n", m->winddir);
1407 if (m->sky)
1408 fprintf (freezer, "sky %d\n", m->sky);
1409 if (m->nosmooth)
1410 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1411 905
1412 /* Save any tiling information, except on overlays */ 906 return freezer.save (path);
1413 if (flag != 2)
1414 for (i = 0; i < 4; i++)
1415 if (m->tile_path[i])
1416 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1417
1418 freezer.put (m);
1419 fprintf (freezer, "end\n");
1420
1421 /* In the game save unique items in the different file, but
1422 * in the editor save them to the normal map file.
1423 * If unique map, save files in the proper destination (set by
1424 * player)
1425 */
1426 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1427 {
1428 object_freezer unique;
1429
1430 if (flag == 2)
1431 save_objects (m, freezer, unique, 2);
1432 else
1433 save_objects (m, freezer, unique, 0);
1434
1435 sprintf (buf, "%s.v00", create_items_path (m->path));
1436
1437 unique.save (buf);
1438 }
1439 else
1440 { /* save same file when not playing, like in editor */
1441 save_objects (m, freezer, freezer, 0);
1442 }
1443
1444 freezer.save (filename);
1445
1446 return 0;
1447} 907}
1448 908
1449/* 909/*
1450 * Remove and free all objects in the given map. 910 * Remove and free all objects in the given map.
1451 */ 911 */
1452void 912void
1453free_all_objects (maptile *m) 913maptile::clear ()
1454{ 914{
1455 if (!m->spaces) 915 if (!spaces)
1456 return; 916 return;
1457 917
1458 for (int i = 0; i < m->width; i++) 918 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1459 for (int j = 0; j < m->height; j++) 919 while (object *op = ms->bot)
1460 { 920 {
1461 mapspace &ms = m->at (i, j);
1462
1463 while (object *op = ms.bot)
1464 {
1465 if (op->head) 921 if (op->head)
1466 op = op->head; 922 op = op->head;
1467 923
1468 op->destroy_inv (false); 924 op->destroy_inv (false);
1469 op->destroy (); 925 op->destroy ();
1470 }
1471 } 926 }
1472}
1473 927
1474/* 928 sfree (spaces, size ()), spaces = 0;
1475 * Frees everything allocated by the given maptileure. 929
1476 * don't free tmpname - our caller is left to do that 930 if (buttons)
1477 */ 931 free_objectlinkpt (buttons), buttons = 0;
932}
933
1478void 934void
1479free_map (maptile *m, int flag) 935maptile::clear_header ()
1480{ 936{
1481 if (!m->in_memory) //TODO: makes no sense to me? 937 name = 0;
1482 return; 938 msg = 0;
1483 939 maplore = 0;
1484 m->in_memory = MAP_SAVING; 940 shoprace = 0;
1485
1486 // TODO: use new/delete
1487
1488 if (flag && m->spaces)
1489 free_all_objects (m);
1490
1491 free (m->name), m->name = 0;
1492 free (m->spaces), m->spaces = 0;
1493 free (m->msg), m->msg = 0;
1494 free (m->maplore), m->maplore = 0;
1495 free (m->shoprace), m->shoprace = 0;
1496 delete [] m->shopitems, m->shopitems = 0; 941 delete [] shopitems, shopitems = 0;
1497
1498 if (m->buttons)
1499 free_objectlinkpt (m->buttons), m->buttons = 0;
1500 942
1501 for (int i = 0; i < 4; i++) 943 for (int i = 0; i < 4; i++)
1502 {
1503 if (m->tile_path[i])
1504 free (m->tile_path[i]), m->tile_path[i] = 0;
1505
1506 m->tile_map[i] = 0; 944 tile_path [i] = 0;
1507 }
1508
1509 m->in_memory = MAP_SWAPPED;
1510} 945}
1511 946
1512maptile::~maptile () 947maptile::~maptile ()
1513{ 948{
1514 free_map (this, 1); 949 assert (destroyed ());
1515 free (tmpname);
1516} 950}
1517 951
1518void 952void
1519maptile::do_destroy () 953maptile::clear_links_to (maptile *m)
1520{ 954{
1521 attachable::do_destroy ();
1522
1523 free_all_objects (this);
1524
1525 /* We need to look through all the maps and see if any maps 955 /* We need to look through all the maps and see if any maps
1526 * are pointing at this one for tiling information. Since 956 * are pointing at this one for tiling information. Since
1527 * tiling can be asymetric, we just can not look to see which 957 * tiling can be asymetric, we just can not look to see which
1528 * maps this map tiles with and clears those. 958 * maps this map tiles with and clears those.
1529 */ 959 */
1530 //TODO: non-euclidean-tiling MUST GO
1531 for (maptile *m = first_map; m; m = m->next)
1532 for (int i = 0; i < 4; i++) 960 for (int i = 0; i < 4; i++)
1533 if (m->tile_map[i] == this) 961 if (tile_map[i] == m)
1534 m->tile_map[i] = 0; 962 tile_map[i] = 0;
1535
1536 if (first_map == this)
1537 first_map = next;
1538 else
1539 for (maptile *m = first_map; m; m = m->next)
1540 if (m->next = this)
1541 {
1542 m->next = next;
1543 break;
1544 }
1545} 963}
1546 964
1547//TODO: must go
1548void 965void
1549delete_map (maptile *m) 966maptile::do_destroy ()
1550{ 967{
1551 if (m) 968 attachable::do_destroy ();
1552 m->destroy (); 969
970 clear ();
1553} 971}
1554 972
1555/* 973/*
1556 * Makes sure the given map is loaded and swapped in. 974 * Updates every button on the map (by calling update_button() for them).
1557 * name is path name of the map.
1558 * flags meaning:
1559 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1560 * and don't do unique items or the like.
1561 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1562 * dont do any more name translation on it.
1563 * 975 */
1564 * Returns a pointer to the given map. 976void
1565 */ 977maptile::update_buttons ()
1566maptile *
1567ready_map_name (const char *name, int flags)
1568{ 978{
1569 if (!name) 979 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1570 return 0; 980 for (objectlink *ol = obp->link; ol; ol = ol->next)
1571
1572 /* Have we been at this level before? */
1573 maptile *m = has_been_loaded (name);
1574
1575 /* Map is good to go, so just return it */
1576 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1577 return m;
1578
1579 /* unique maps always get loaded from their original location, and never
1580 * a temp location. Likewise, if map_flush is set, or we have never loaded
1581 * this map, load it now. I removed the reset checking from here -
1582 * it seems the probability of a player trying to enter a map that should
1583 * reset but hasn't yet is quite low, and removing that makes this function
1584 * a bit cleaner (and players probably shouldn't rely on exact timing for
1585 * resets in any case - if they really care, they should use the 'maps command.
1586 */
1587 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1588 { 981 {
1589 /* first visit or time to reset */ 982 if (!ol->ob)
1590 if (m)
1591 { 983 {
1592 clean_tmp_map (m); /* Doesn't make much difference */ 984 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1593 delete_map (m); 985 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
986 continue;
1594 } 987 }
1595 988
1596 /* create and load a map */ 989 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1597 if (flags & MAP_PLAYER_UNIQUE)
1598 LOG (llevDebug, "Trying to load map %s.\n", name);
1599 else
1600 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1601
1602 //eval_pv ("$x = Event::time", 1);//D
1603 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1604 return (NULL);
1605 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1606
1607 fix_auto_apply (m); /* Chests which open as default */
1608
1609 /* If a player unique map, no extra unique object file to load.
1610 * if from the editor, likewise.
1611 */
1612 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1613 load_unique_objects (m);
1614
1615 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1616 { 990 {
1617 m = load_overlay_map (name, m); 991 update_button (ol->ob);
1618 if (m == NULL) 992 break;
1619 return NULL;
1620 } 993 }
1621
1622 if (flags & MAP_PLAYER_UNIQUE)
1623 INVOKE_MAP (SWAPIN, m);
1624
1625 } 994 }
1626 else
1627 {
1628 /* If in this loop, we found a temporary map, so load it up. */
1629
1630 m = load_temporary_map (m);
1631 if (m == NULL)
1632 return NULL;
1633 load_unique_objects (m);
1634
1635 clean_tmp_map (m);
1636 m->in_memory = MAP_IN_MEMORY;
1637 /* tempnam() on sun systems (probably others) uses malloc
1638 * to allocated space for the string. Free it here.
1639 * In some cases, load_temporary_map above won't find the
1640 * temporary map, and so has reloaded a new map. If that
1641 * is the case, tmpname is now null
1642 */
1643 if (m->tmpname)
1644 free (m->tmpname);
1645 m->tmpname = NULL;
1646 /* It's going to be saved anew anyway */
1647 }
1648
1649 /* Below here is stuff common to both first time loaded maps and
1650 * temp maps.
1651 */
1652
1653 decay_objects (m); /* start the decay */
1654 /* In case other objects press some buttons down */
1655 update_buttons (m);
1656 if (m->outdoor)
1657 set_darkness_map (m);
1658 /* run the weather over this map */
1659 weather_effect (name);
1660 return m;
1661} 995}
1662
1663 996
1664/* 997/*
1665 * This routine is supposed to find out the difficulty of the map. 998 * This routine is supposed to find out the difficulty of the map.
1666 * difficulty does not have a lot to do with character level, 999 * difficulty does not have a lot to do with character level,
1667 * but does have a lot to do with treasure on the map. 1000 * but does have a lot to do with treasure on the map.
1669 * Difficulty can now be set by the map creature. If the value stored 1002 * Difficulty can now be set by the map creature. If the value stored
1670 * in the map is zero, then use this routine. Maps should really 1003 * in the map is zero, then use this routine. Maps should really
1671 * have a difficulty set than using this function - human calculation 1004 * have a difficulty set than using this function - human calculation
1672 * is much better than this functions guesswork. 1005 * is much better than this functions guesswork.
1673 */ 1006 */
1674
1675int 1007int
1676calculate_difficulty (maptile *m) 1008maptile::estimate_difficulty () const
1677{ 1009{
1678 object *op;
1679 archetype *at;
1680 int x, y, i;
1681 long monster_cnt = 0; 1010 long monster_cnt = 0;
1682 double avgexp = 0; 1011 double avgexp = 0;
1683 sint64 total_exp = 0; 1012 sint64 total_exp = 0;
1684 1013
1685 if (m->difficulty) 1014 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1686 { 1015 for (object *op = ms->bot; op; op = op->above)
1687 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1688 return m->difficulty;
1689 }
1690
1691 for (x = 0; x < m->width; x++)
1692 for (y = 0; y < m->height; y++)
1693 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1694 { 1016 {
1695 if (QUERY_FLAG (op, FLAG_MONSTER)) 1017 if (QUERY_FLAG (op, FLAG_MONSTER))
1696 { 1018 {
1697 total_exp += op->stats.exp; 1019 total_exp += op->stats.exp;
1698 monster_cnt++; 1020 monster_cnt++;
1699 } 1021 }
1700 1022
1701 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1023 if (QUERY_FLAG (op, FLAG_GENERATOR))
1702 { 1024 {
1703 total_exp += op->stats.exp; 1025 total_exp += op->stats.exp;
1026
1704 at = type_to_archetype (GENERATE_TYPE (op)); 1027 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1705
1706 if (at != NULL)
1707 total_exp += at->clone.stats.exp * 8; 1028 total_exp += at->clone.stats.exp * 8;
1708 1029
1709 monster_cnt++; 1030 monster_cnt++;
1710 } 1031 }
1711 } 1032 }
1712 1033
1713 avgexp = (double) total_exp / monster_cnt; 1034 avgexp = (double) total_exp / monster_cnt;
1714 1035
1715 for (i = 1; i <= settings.max_level; i++) 1036 for (int i = 1; i <= settings.max_level; i++)
1716 {
1717 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp)) 1037 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp))
1718 {
1719 /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1720 return i; 1038 return i;
1721 }
1722 }
1723 1039
1724 return 1; 1040 return 1;
1725}
1726
1727void
1728clean_tmp_map (maptile *m)
1729{
1730 if (m->tmpname == NULL)
1731 return;
1732 INVOKE_MAP (CLEAN, m);
1733 (void) unlink (m->tmpname);
1734}
1735
1736void
1737free_all_maps (void)
1738{
1739 int real_maps = 0;
1740
1741 while (first_map)
1742 {
1743 /* I think some of the callers above before it gets here set this to be
1744 * saving, but we still want to free this data
1745 */
1746 if (first_map->in_memory == MAP_SAVING)
1747 first_map->in_memory = MAP_IN_MEMORY;
1748 delete_map (first_map);
1749 real_maps++;
1750 }
1751 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1752} 1041}
1753 1042
1754/* change_map_light() - used to change map light level (darkness) 1043/* change_map_light() - used to change map light level (darkness)
1755 * up or down. Returns true if successful. It should now be 1044 * up or down. Returns true if successful. It should now be
1756 * possible to change a value by more than 1. 1045 * possible to change a value by more than 1.
1757 * Move this from los.c to map.c since this is more related 1046 * Move this from los.c to map.c since this is more related
1758 * to maps than los. 1047 * to maps than los.
1759 * postive values make it darker, negative make it brighter 1048 * postive values make it darker, negative make it brighter
1760 */ 1049 */
1761
1762int 1050int
1763change_map_light (maptile *m, int change) 1051maptile::change_map_light (int change)
1764{ 1052{
1765 int new_level = m->darkness + change; 1053 int new_level = darkness + change;
1766 1054
1767 /* Nothing to do */ 1055 /* Nothing to do */
1768 if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS)) 1056 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))
1769 {
1770 return 0; 1057 return 0;
1771 }
1772 1058
1773 /* inform all players on the map */ 1059 /* inform all players on the map */
1774 if (change > 0) 1060 if (change > 0)
1775 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); 1061 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1776 else 1062 else
1777 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); 1063 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1778 1064
1779 /* Do extra checking. since m->darkness is a unsigned value, 1065 /* Do extra checking. since darkness is a unsigned value,
1780 * we need to be extra careful about negative values. 1066 * we need to be extra careful about negative values.
1781 * In general, the checks below are only needed if change 1067 * In general, the checks below are only needed if change
1782 * is not +/-1 1068 * is not +/-1
1783 */ 1069 */
1784 if (new_level < 0) 1070 if (new_level < 0)
1785 m->darkness = 0; 1071 darkness = 0;
1786 else if (new_level >= MAX_DARKNESS) 1072 else if (new_level >= MAX_DARKNESS)
1787 m->darkness = MAX_DARKNESS; 1073 darkness = MAX_DARKNESS;
1788 else 1074 else
1789 m->darkness = new_level; 1075 darkness = new_level;
1790 1076
1791 /* All clients need to get re-updated for the change */ 1077 /* All clients need to get re-updated for the change */
1792 update_all_map_los (m); 1078 update_all_map_los (this);
1793 return 1; 1079 return 1;
1794} 1080}
1795 1081
1796/* 1082/*
1797 * This function updates various attributes about a specific space 1083 * This function updates various attributes about a specific space
1969 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1255 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1970 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1256 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1971 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1257 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1972} 1258}
1973 1259
1974void
1975set_map_reset_time (maptile *map)
1976{
1977 int timeout;
1978
1979 timeout = map->reset_timeout;
1980 if (timeout <= 0)
1981 timeout = MAP_DEFAULTRESET;
1982 if (timeout >= MAP_MAXRESET)
1983 timeout = MAP_MAXRESET;
1984 map->reset_time = time (0) + timeout;
1985}
1986
1987/* this updates the orig_map->tile_map[tile_num] value after loading 1260/* this updates the orig_map->tile_map[tile_num] value after loading
1988 * the map. It also takes care of linking back the freshly loaded 1261 * the map. It also takes care of linking back the freshly loaded
1989 * maps tile_map values if it tiles back to this one. It returns 1262 * maps tile_map values if it tiles back to this one. It returns
1990 * the value of orig_map->tile_map[tile_num]. It really only does this 1263 * the value of orig_map->tile_map[tile_num]. It really only does this
1991 * so that it is easier for calling functions to verify success. 1264 * so that it is easier for calling functions to verify success.
1992 */ 1265 */
1993
1994static maptile * 1266static maptile *
1995load_and_link_tiled_map (maptile *orig_map, int tile_num) 1267load_and_link_tiled_map (maptile *orig_map, int tile_num)
1996{ 1268{
1269 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map);
1270
1271 if (!mp || mp->in_memory != MAP_IN_MEMORY)
1272 {
1273 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1274 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1275 &orig_map->tile_path[tile_num], &orig_map->path);
1276 mp = new maptile (1, 1);
1277 mp->alloc ();
1278 mp->in_memory = MAP_IN_MEMORY;
1279 }
1280
1997 int dest_tile = (tile_num + 2) % 4; 1281 int dest_tile = (tile_num + 2) % 4;
1998 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
1999 1282
2000 orig_map->tile_map[tile_num] = ready_map_name (path, 0); 1283 orig_map->tile_map[tile_num] = mp;
2001 1284
2002 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1285 // optimisation: back-link map to origin map if euclidean
2003 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && !strcmp (orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path)) 1286 //TODO: non-euclidean maps MUST GO
1287 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
2004 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1288 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
2005 1289
2006 return orig_map->tile_map[tile_num]; 1290 return mp;
2007} 1291}
2008 1292
2009/* this returns TRUE if the coordinates (x,y) are out of 1293/* this returns TRUE if the coordinates (x,y) are out of
2010 * map m. This function also takes into account any 1294 * map m. This function also takes into account any
2011 * tiling considerations, loading adjacant maps as needed. 1295 * tiling considerations, loading adjacant maps as needed.
2012 * This is the function should always be used when it 1296 * This is the function should always be used when it
2013 * necessary to check for valid coordinates. 1297 * necessary to check for valid coordinates.
2014 * This function will recursively call itself for the 1298 * This function will recursively call itself for the
2015 * tiled maps. 1299 * tiled maps.
2016 *
2017 *
2018 */ 1300 */
2019int 1301int
2020out_of_map (maptile *m, int x, int y) 1302out_of_map (maptile *m, int x, int y)
2021{ 1303{
2022 /* If we get passed a null map, this is obviously the 1304 /* If we get passed a null map, this is obviously the
2032 return 1; 1314 return 1;
2033 1315
2034 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1316 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2035 load_and_link_tiled_map (m, 3); 1317 load_and_link_tiled_map (m, 3);
2036 1318
2037 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y)); 1319 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
2038 } 1320 }
2039 1321
2040 if (x >= m->width) 1322 if (x >= m->width)
2041 { 1323 {
2042 if (!m->tile_path[1]) 1324 if (!m->tile_path[1])
2043 return 1; 1325 return 1;
2044 1326
2045 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1327 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2046 load_and_link_tiled_map (m, 1); 1328 load_and_link_tiled_map (m, 1);
2047 1329
2048 return (out_of_map (m->tile_map[1], x - m->width, y)); 1330 return out_of_map (m->tile_map[1], x - m->width, y);
2049 } 1331 }
2050 1332
2051 if (y < 0) 1333 if (y < 0)
2052 { 1334 {
2053 if (!m->tile_path[0]) 1335 if (!m->tile_path[0])
2054 return 1; 1336 return 1;
2055 1337
2056 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1338 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2057 load_and_link_tiled_map (m, 0); 1339 load_and_link_tiled_map (m, 0);
2058 1340
2059 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height)); 1341 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
2060 } 1342 }
2061 1343
2062 if (y >= m->height) 1344 if (y >= m->height)
2063 { 1345 {
2064 if (!m->tile_path[2]) 1346 if (!m->tile_path[2])
2065 return 1; 1347 return 1;
2066 1348
2067 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1349 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2068 load_and_link_tiled_map (m, 2); 1350 load_and_link_tiled_map (m, 2);
2069 1351
2070 return (out_of_map (m->tile_map[2], x, y - m->height)); 1352 return out_of_map (m->tile_map[2], x, y - m->height);
2071 } 1353 }
2072 1354
2073 /* Simple case - coordinates are within this local 1355 /* Simple case - coordinates are within this local
2074 * map. 1356 * map.
2075 */ 1357 */
2083 * updates x and y to be the localized coordinates. 1365 * updates x and y to be the localized coordinates.
2084 * Using this is more efficient of calling out_of_map 1366 * Using this is more efficient of calling out_of_map
2085 * and then figuring out what the real map is 1367 * and then figuring out what the real map is
2086 */ 1368 */
2087maptile * 1369maptile *
2088get_map_from_coord (maptile *m, sint16 * x, sint16 * y) 1370get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
2089{ 1371{
2090
2091 if (*x < 0) 1372 if (*x < 0)
2092 { 1373 {
2093 if (!m->tile_path[3]) 1374 if (!m->tile_path[3])
2094 return 0; 1375 return 0;
1376
2095 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1377 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2096 load_and_link_tiled_map (m, 3); 1378 load_and_link_tiled_map (m, 3);
2097 1379
2098 *x += m->tile_map[3]->width; 1380 *x += m->tile_map[3]->width;
2099 return (get_map_from_coord (m->tile_map[3], x, y)); 1381 return (get_map_from_coord (m->tile_map[3], x, y));
2136 } 1418 }
2137 1419
2138 /* Simple case - coordinates are within this local 1420 /* Simple case - coordinates are within this local
2139 * map. 1421 * map.
2140 */ 1422 */
2141
2142 return m; 1423 return m;
2143} 1424}
2144 1425
2145/** 1426/**
2146 * Return whether map2 is adjacent to map1. If so, store the distance from 1427 * Return whether map2 is adjacent to map1. If so, store the distance from
2154 1435
2155 if (map1 == map2) 1436 if (map1 == map2)
2156 { 1437 {
2157 *dx = 0; 1438 *dx = 0;
2158 *dy = 0; 1439 *dy = 0;
2159
2160 } 1440 }
2161 else if (map1->tile_map[0] == map2) 1441 else if (map1->tile_map[0] == map2)
2162 { /* up */ 1442 { /* up */
2163 *dx = 0; 1443 *dx = 0;
2164 *dy = -map2->height; 1444 *dy = -map2->height;
2175 } 1455 }
2176 else if (map1->tile_map[3] == map2) 1456 else if (map1->tile_map[3] == map2)
2177 { /* left */ 1457 { /* left */
2178 *dx = -map2->width; 1458 *dx = -map2->width;
2179 *dy = 0; 1459 *dy = 0;
2180
2181 } 1460 }
2182 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1461 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2183 { /* up right */ 1462 { /* up right */
2184 *dx = map1->tile_map[0]->width; 1463 *dx = map1->tile_map[0]->width;
2185 *dy = -map1->tile_map[0]->height; 1464 *dy = -map1->tile_map[0]->height;
2216 } 1495 }
2217 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1496 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2218 { /* left down */ 1497 { /* left down */
2219 *dx = -map1->tile_map[3]->width; 1498 *dx = -map1->tile_map[3]->width;
2220 *dy = map1->tile_map[3]->height; 1499 *dy = map1->tile_map[3]->height;
2221
2222 } 1500 }
2223 else 1501 else
2224 { /* not "adjacent" enough */
2225 return 0; 1502 return 0;
2226 }
2227 1503
2228 return 1; 1504 return 1;
2229} 1505}
2230 1506
2231/* From map.c 1507/* From map.c
2246 * be unexpected 1522 * be unexpected
2247 * 1523 *
2248 * currently, the only flag supported (0x1) is don't translate for 1524 * currently, the only flag supported (0x1) is don't translate for
2249 * closest body part of 'op1' 1525 * closest body part of 'op1'
2250 */ 1526 */
2251
2252void 1527void
2253get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1528get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2254{ 1529{
2255 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1530 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2256 { 1531 {
2337 } 1612 }
2338} 1613}
2339 1614
2340/* Returns true of op1 and op2 are effectively on the same map 1615/* Returns true of op1 and op2 are effectively on the same map
2341 * (as related to map tiling). Note that this looks for a path from 1616 * (as related to map tiling). Note that this looks for a path from
2342 * op1 to op2, so if the tiled maps are assymetric and op2 has a path 1617 * op1 to op2, so if the tiled maps are asymetric and op2 has a path
2343 * to op1, this will still return false. 1618 * to op1, this will still return false.
2344 * Note we only look one map out to keep the processing simple 1619 * Note we only look one map out to keep the processing simple
2345 * and efficient. This could probably be a macro. 1620 * and efficient. This could probably be a macro.
2346 * MSW 2001-08-05 1621 * MSW 2001-08-05
2347 */ 1622 */
2350{ 1625{
2351 int dx, dy; 1626 int dx, dy;
2352 1627
2353 return adjacent_map (op1->map, op2->map, &dx, &dy); 1628 return adjacent_map (op1->map, op2->map, &dx, &dy);
2354} 1629}
1630
1631object *
1632maptile::insert (object *op, int x, int y, object *originator, int flags)
1633{
1634 if (!op->flag [FLAG_REMOVED])
1635 op->remove ();
1636
1637 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1638}
1639

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines