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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines