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

Diff Legend

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