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.41 by root, Tue Dec 12 22:37:05 2006 UTC vs.
Revision 1.61 by root, Sun Dec 31 17:17:22 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;
409 maptile *m1; 333 maptile *m1;
410 sint16 sx, sy; 334 sint16 sx, sy;
411 335
412 if (ob == NULL) 336 if (!ob)
413 { 337 {
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
592 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
593 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
594 }
595 }
596 } 501 }
597 502
598 op->destroy (); 503 op->destroy ();
599 link_multipart_objects (m);
600}
601 504
602/* This saves all the objects on the map in a non destructive fashion. 505#if 0
603 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 506 for (i = 0; i < width; i++)
604 * and we only save the head of multi part objects - this is needed 507 for (j = 0; j < height; j++)
605 * in order to do map tiling properly.
606 */
607void
608save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag)
609{
610 int i, j = 0, unique = 0;
611 object *op;
612
613 /* first pass - save one-part objects */
614 for (i = 0; i < MAP_WIDTH (m); i++)
615 for (j = 0; j < MAP_HEIGHT (m); j++)
616 { 508 {
617 unique = 0; 509 unique = 0;
510 /* check for unique items, or unique squares */
618 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)
619 { 512 {
620 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))
621 unique = 1; 514 unique = 1;
622 515
623 if (op->type == PLAYER) 516 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
624 { 517 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
625 LOG (llevDebug, "Player on map that is being saved\n");
626 continue;
627 } 518 }
519 }
520#endif
628 521
629 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_recursive ();
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_recursive ();
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 ())
630 continue; 565 continue;
631 566
632 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 567 if (unique || op->flag [FLAG_UNIQUE])
633 save_object (fp2, op, 3); 568 {
634 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 569 if (flags & IO_UNIQUES)
635 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 }
636 576
637 } /* for this space */ 577 return true;
638 } /* 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);
639} 611}
640 612
641maptile::maptile () 613maptile::maptile ()
642{ 614{
643 in_memory = MAP_SWAPPED; 615 in_memory = MAP_SWAPPED;
616
644 /* 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
645 * map archetype. Mimic that behaviour. 618 * map archetype. Mimic that behaviour.
646 */ 619 */
647 MAP_WIDTH (this) = 16; 620 width = 16;
648 MAP_HEIGHT (this) = 16; 621 height = 16;
649 MAP_RESET_TIMEOUT (this) = 0; 622 reset_timeout = 0;
650 MAP_TIMEOUT (this) = 300; 623 timeout = 300;
651 MAP_ENTER_X (this) = 0; 624 enter_x = 0;
652 MAP_ENTER_Y (this) = 0; 625 enter_y = 0;
653 /*set part to -1 indicating conversion to weather map not yet done */
654 MAP_WORLDPARTX (this) = -1;
655 MAP_WORLDPARTY (this) = -1;
656} 626}
657 627
658/* 628maptile::maptile (int w, int h)
659 * Allocates, initialises, and returns a pointer to a maptile.
660 * Modified to no longer take a path option which was not being
661 * used anyways. MSW 2001-07-01
662 */
663maptile *
664get_linked_map (void)
665{ 629{
666 maptile *mp, *map = new maptile; 630 in_memory = MAP_SWAPPED;
667 631
668 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;
669 638
670 if (mp == NULL) 639 alloc ();
671 first_map = map;
672 else
673 mp->next = map;
674
675 return map;
676} 640}
677 641
678/* 642/*
679 * Allocates the arrays contained in a maptile. 643 * Allocates the arrays contained in a maptile.
680 * This basically allocates the dynamic array of spaces for the 644 * This basically allocates the dynamic array of spaces for the
681 * map. 645 * map.
682 */ 646 */
683void 647void
684maptile::allocate () 648maptile::alloc ()
685{ 649{
686 in_memory = MAP_IN_MEMORY;
687
688 /* Log this condition and free the storage. We could I suppose
689 * realloc, but if the caller is presuming the data will be intact,
690 * that is their poor assumption.
691 */
692 if (spaces) 650 if (spaces)
693 {
694 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
695 free (spaces);
696 }
697
698 spaces = (MapSpace *)
699 calloc (1, width * height * sizeof (MapSpace));
700
701 if (!spaces)
702 fatal (OUT_OF_MEMORY);
703}
704
705/* Create and returns a map of the specific size. Used
706 * in random map code and the editor.
707 */
708maptile *
709get_empty_map (int sizex, int sizey)
710{
711 maptile *m = get_linked_map ();
712
713 m->width = sizex;
714 m->height = sizey;
715 m->in_memory = MAP_SWAPPED;
716 m->allocate ();
717
718 return m; 651 return;
652
653 spaces = salloc0<mapspace> (size ());
719} 654}
720 655
721/* 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
722 * 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
723 * at a later date. 658 * at a later date.
724 * Called by parse_map_headers below. 659 * Called by parse_map_headers below.
725 */ 660 */
726
727static shopitems * 661static shopitems *
728parse_shop_string (const char *input_string) 662parse_shop_string (const char *input_string)
729{ 663{
730 char *shop_string, *p, *q, *next_semicolon, *next_colon; 664 char *shop_string, *p, *q, *next_semicolon, *next_colon;
731 shopitems *items = NULL; 665 shopitems *items = NULL;
732 int i = 0, number_of_entries = 0; 666 int i = 0, number_of_entries = 0;
733 const typedata *current_type; 667 const typedata *current_type;
734 668
735 shop_string = strdup_local (input_string); 669 shop_string = strdup (input_string);
736 p = shop_string; 670 p = shop_string;
737 /* 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 */
738 while (p) 672 while (p)
739 { 673 {
740 p = strchr (p, ';'); 674 p = strchr (p, ';');
741 number_of_entries++; 675 number_of_entries++;
742 if (p) 676 if (p)
743 p++; 677 p++;
744 } 678 }
679
745 p = shop_string; 680 p = shop_string;
746 strip_endline (p); 681 strip_endline (p);
747 items = new shopitems[number_of_entries + 1]; 682 items = new shopitems[number_of_entries + 1];
748 for (i = 0; i < number_of_entries; i++) 683 for (i = 0; i < number_of_entries; i++)
749 { 684 {
750 if (!p) 685 if (!p)
751 { 686 {
752 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");
753 break; 688 break;
754 } 689 }
690
755 next_semicolon = strchr (p, ';'); 691 next_semicolon = strchr (p, ';');
756 next_colon = strchr (p, ':'); 692 next_colon = strchr (p, ':');
757 /* 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. */
758 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 694 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
759 items[i].strength = atoi (strchr (p, ':') + 1); 695 items[i].strength = atoi (strchr (p, ':') + 1);
… …
786 * 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
787 */ 723 */
788 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);
789 } 725 }
790 } 726 }
727
791 items[i].index = number_of_entries; 728 items[i].index = number_of_entries;
792 if (next_semicolon) 729 if (next_semicolon)
793 p = ++next_semicolon; 730 p = ++next_semicolon;
794 else 731 else
795 p = NULL; 732 p = NULL;
796 } 733 }
734
797 free (shop_string); 735 free (shop_string);
798 return items; 736 return items;
799} 737}
800 738
801/* 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
… …
810 for (i = 0; i < m->shopitems[0].index; i++) 748 for (i = 0; i < m->shopitems[0].index; i++)
811 { 749 {
812 if (m->shopitems[i].typenum) 750 if (m->shopitems[i].typenum)
813 { 751 {
814 if (m->shopitems[i].strength) 752 if (m->shopitems[i].strength)
815 {
816 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);
817 }
818 else 754 else
819 sprintf (tmp, "%s;", m->shopitems[i].name); 755 sprintf (tmp, "%s;", m->shopitems[i].name);
820 } 756 }
821 else 757 else
822 { 758 {
823 if (m->shopitems[i].strength) 759 if (m->shopitems[i].strength)
824 {
825 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 760 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
826 }
827 else 761 else
828 sprintf (tmp, "*"); 762 sprintf (tmp, "*");
829 } 763 }
764
830 strcat (output_string, tmp); 765 strcat (output_string, tmp);
831 } 766 }
832} 767}
833 768
834/* This loads the header information of the map. The header 769/* This loads the header information of the map. The header
… …
839 * 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
840 * sense. 775 * sense.
841 * 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
842 * 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.
843 * MSW 2001-07-01 778 * MSW 2001-07-01
844 * return 0 on success, 1 on failure.
845 */ 779 */
846 780bool
847static int 781maptile::load_header (object_thawer &thawer)
848load_map_header (object_thawer & fp, maptile *m)
849{ 782{
850 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;
851 int msgpos = 0; 784 int msgpos = 0;
852 int maplorepos = 0; 785 int maplorepos = 0;
853 786
854 while (fgets (buf, HUGE_BUF, fp) != NULL) 787 for (;;)
855 { 788 {
856 buf[HUGE_BUF - 1] = 0; 789 keyword kw = thawer.get_kv ();
857 key = buf;
858 790
859 while (isspace (*key)) 791 switch (kw)
860 key++;
861
862 if (*key == 0)
863 continue; /* empty line */
864
865 value = strchr (key, ' ');
866
867 if (!value)
868 { 792 {
869 if ((end = strchr (key, '\n'))) 793 case KW_EOF:
870 *end = 0; 794 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &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;
871 } 863 }
872 else
873 {
874 *value = 0;
875 value++;
876 end = strchr (value, '\n');
877
878 while (isspace (*value))
879 {
880 value++;
881
882 if (*value == '\0' || value == end)
883 {
884 /* Nothing but spaces. */
885 value = NULL;
886 break;
887 }
888 }
889 }
890
891 if (!end)
892 {
893 LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
894 return 1;
895 }
896
897 /* key is the field name, value is what it should be set
898 * to. We've already done the work to null terminate key,
899 * and strip off any leading spaces for both of these.
900 * We have not touched the newline at the end of the line -
901 * these are needed for some values. the end pointer
902 * points to the first of the newlines.
903 * value could be NULL! It would be easy enough to just point
904 * this to "" to prevent cores, but that would let more errors slide
905 * through.
906 *
907 * First check for entries that do not use the value parameter, then
908 * validate that value is given and check for the remaining entries
909 * that use the parameter.
910 */
911
912 if (!strcmp (key, "msg"))
913 {
914 while (fgets (buf, HUGE_BUF, fp) != NULL)
915 {
916 if (!strcmp (buf, "endmsg\n"))
917 break;
918 else
919 {
920 /* slightly more efficient than strcat */
921 strcpy (msgbuf + msgpos, buf);
922 msgpos += strlen (buf);
923 }
924 }
925 /* There are lots of maps that have empty messages (eg, msg/endmsg
926 * with nothing between). There is no reason in those cases to
927 * keep the empty message. Also, msgbuf contains garbage data
928 * when msgpos is zero, so copying it results in crashes
929 */
930 if (msgpos != 0)
931 m->msg = strdup_local (msgbuf);
932 }
933 else if (!strcmp (key, "maplore"))
934 {
935 while (fgets (buf, HUGE_BUF, fp) != NULL)
936 {
937 if (!strcmp (buf, "endmaplore\n"))
938 break;
939 else
940 {
941 /* slightly more efficient than strcat */
942 strcpy (maplorebuf + maplorepos, buf);
943 maplorepos += strlen (buf);
944 }
945 }
946 if (maplorepos != 0)
947 m->maplore = strdup_local (maplorebuf);
948 }
949 else if (!strcmp (key, "end"))
950 {
951 break;
952 }
953 else if (value == NULL)
954 {
955 LOG (llevError, "Got '%s' line without parameter in map header\n", key);
956 }
957 else if (!strcmp (key, "arch"))
958 {
959 /* This is an oddity, but not something we care about much. */
960 if (strcmp (value, "map\n"))
961 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
962 }
963 else if (!strcmp (key, "name"))
964 {
965 *end = 0;
966 m->name = strdup_local (value);
967 }
968 /* first strcmp value on these are old names supported
969 * for compatibility reasons. The new values (second) are
970 * what really should be used.
971 */
972 else if (!strcmp (key, "oid"))
973 fp.get (m, atoi (value));
974 else if (!strcmp (key, "attach"))
975 m->attach = value;
976 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
977 m->enter_x = atoi (value);
978 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
979 m->enter_y = atoi (value);
980 else if (!strcmp (key, "x") || !strcmp (key, "width"))
981 m->width = atoi (value);
982 else if (!strcmp (key, "y") || !strcmp (key, "height"))
983 m->height = atoi (value);
984 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
985 m->reset_timeout = atoi (value);
986 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
987 m->timeout = atoi (value);
988 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
989 m->difficulty = clamp (atoi (value), 1, settings.max_level);
990 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
991 m->darkness = atoi (value);
992 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
993 m->fixed_resettime = atoi (value);
994 else if (!strcmp (key, "unique"))
995 m->unique = atoi (value);
996 else if (!strcmp (key, "template"))
997 m->templatemap = atoi (value);
998 else if (!strcmp (key, "region"))
999 m->region = get_region_by_name (value);
1000 else if (!strcmp (key, "shopitems"))
1001 {
1002 *end = 0;
1003 m->shopitems = parse_shop_string (value);
1004 }
1005 else if (!strcmp (key, "shopgreed"))
1006 m->shopgreed = atof (value);
1007 else if (!strcmp (key, "shopmin"))
1008 m->shopmin = atol (value);
1009 else if (!strcmp (key, "shopmax"))
1010 m->shopmax = atol (value);
1011 else if (!strcmp (key, "shoprace"))
1012 {
1013 *end = 0;
1014 m->shoprace = strdup_local (value);
1015 }
1016 else if (!strcmp (key, "outdoor"))
1017 m->outdoor = atoi (value);
1018 else if (!strcmp (key, "temp"))
1019 m->temp = atoi (value);
1020 else if (!strcmp (key, "pressure"))
1021 m->pressure = atoi (value);
1022 else if (!strcmp (key, "humid"))
1023 m->humid = atoi (value);
1024 else if (!strcmp (key, "windspeed"))
1025 m->windspeed = atoi (value);
1026 else if (!strcmp (key, "winddir"))
1027 m->winddir = atoi (value);
1028 else if (!strcmp (key, "sky"))
1029 m->sky = atoi (value);
1030 else if (!strcmp (key, "nosmooth"))
1031 m->nosmooth = atoi (value);
1032 else if (!strncmp (key, "tile_path_", 10))
1033 {
1034 int tile = atoi (key + 10);
1035
1036 if (tile < 1 || tile > 4)
1037 {
1038 LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
1039 }
1040 else
1041 {
1042 char *path;
1043
1044 *end = 0;
1045
1046 if (m->tile_path[tile - 1])
1047 {
1048 LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
1049 free (m->tile_path[tile - 1]);
1050 m->tile_path[tile - 1] = NULL;
1051 }
1052
1053 if (check_path (value, 1) != -1)
1054 {
1055 /* The unadorned path works. */
1056 path = value;
1057 }
1058 else
1059 {
1060 /* Try again; it could be a relative exit. */
1061
1062 path = path_combine_and_normalize (m->path, value);
1063
1064 if (check_path (path, 1) == -1)
1065 {
1066 LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
1067 path = NULL;
1068 }
1069 }
1070
1071 if (editor)
1072 {
1073 /* Use the value as in the file. */
1074 m->tile_path[tile - 1] = strdup_local (value);
1075 }
1076 else if (path != NULL)
1077 {
1078 /* Use the normalized value. */
1079 m->tile_path[tile - 1] = strdup_local (path);
1080 }
1081 } /* end if tile direction (in)valid */
1082 }
1083 else
1084 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1085 }
1086
1087 if (!key || strcmp (key, "end"))
1088 { 864 }
1089 LOG (llevError, "Got premature eof on map header!\n");
1090 return 1;
1091 }
1092 865
1093 return 0; 866 abort ();
1094} 867}
1095 868
1096/* 869bool
1097 * Opens the file "filename" and reads information about the map 870maptile::load_header (const char *path)
1098 * from the given file, and stores it in a newly allocated
1099 * maptile. A pointer to this structure is returned, or NULL on failure.
1100 * flags correspond to those in map.h. Main ones used are
1101 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1102 * MAP_BLOCK, in which case we block on this load. This happens in all
1103 * cases, no matter if this flag is set or not.
1104 * MAP_STYLE: style map - don't add active objects, don't add to server
1105 * managed map list.
1106 */
1107
1108maptile *
1109load_original_map (const char *filename, int flags)
1110{ 871{
1111 maptile *m;
1112 char pathname[MAX_BUF];
1113
1114 if (flags & MAP_PLAYER_UNIQUE)
1115 strcpy (pathname, filename);
1116 else if (flags & MAP_OVERLAY)
1117 strcpy (pathname, create_overlay_pathname (filename));
1118 else
1119 strcpy (pathname, create_pathname (filename));
1120
1121 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1122
1123 object_thawer thawer (pathname); 872 object_thawer thawer (path);
1124 873
1125 if (!thawer) 874 if (!thawer)
1126 return 0; 875 return false;
1127 876
1128 m = get_linked_map (); 877 return load_header (thawer);
1129
1130 strcpy (m->path, filename);
1131 if (load_map_header (thawer, m))
1132 {
1133 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1134 delete_map (m);
1135 return NULL;
1136 }
1137
1138 m->allocate ();
1139
1140 m->in_memory = MAP_LOADING;
1141 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1142
1143 m->in_memory = MAP_IN_MEMORY;
1144 if (!MAP_DIFFICULTY (m))
1145 MAP_DIFFICULTY (m) = calculate_difficulty (m);
1146 set_map_reset_time (m);
1147 m->instantiate ();
1148 return (m);
1149}
1150
1151/*
1152 * Loads a map, which has been loaded earlier, from file.
1153 * Return the map object we load into (this can change from the passed
1154 * option if we can't find the original map)
1155 */
1156
1157static maptile *
1158load_temporary_map (maptile *m)
1159{
1160 char buf[MAX_BUF];
1161
1162 if (!m->tmpname)
1163 {
1164 LOG (llevError, "No temporary filename for map %s\n", m->path);
1165 strcpy (buf, m->path);
1166 delete_map (m);
1167 m = load_original_map (buf, 0);
1168 if (m == NULL)
1169 return NULL;
1170 fix_auto_apply (m); /* Chests which open as default */
1171 return m;
1172 }
1173
1174 object_thawer thawer (m->tmpname);
1175
1176 if (!thawer)
1177 {
1178 strcpy (buf, m->path);
1179 delete_map (m);
1180 m = load_original_map (buf, 0);
1181 if (!m)
1182 return NULL;
1183 fix_auto_apply (m); /* Chests which open as default */
1184 return m;
1185 }
1186
1187 if (load_map_header (thawer, m))
1188 {
1189 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1190 delete_map (m);
1191 m = load_original_map (m->path, 0);
1192 return NULL;
1193 }
1194
1195 m->allocate ();
1196
1197 m->in_memory = MAP_LOADING;
1198 load_objects (m, thawer, 0);
1199
1200 m->in_memory = MAP_IN_MEMORY;
1201 INVOKE_MAP (SWAPIN, m);
1202 return m;
1203}
1204
1205/*
1206 * Loads a map, which has been loaded earlier, from file.
1207 * Return the map object we load into (this can change from the passed
1208 * option if we can't find the original map)
1209 */
1210
1211maptile *
1212load_overlay_map (const char *filename, maptile *m)
1213{
1214 char pathname[MAX_BUF];
1215
1216 strcpy (pathname, create_overlay_pathname (filename));
1217
1218 object_thawer thawer (pathname);
1219
1220 if (!thawer)
1221 return m;
1222
1223 if (load_map_header (thawer, m))
1224 {
1225 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1226 delete_map (m);
1227 m = load_original_map (m->path, 0);
1228 return NULL;
1229 }
1230 /*m->allocate ();*/
1231
1232 m->in_memory = MAP_LOADING;
1233 load_objects (m, thawer, MAP_OVERLAY);
1234
1235 m->in_memory = MAP_IN_MEMORY;
1236 return m;
1237} 878}
1238 879
1239/****************************************************************************** 880/******************************************************************************
1240 * This is the start of unique map handling code 881 * This is the start of unique map handling code
1241 *****************************************************************************/ 882 *****************************************************************************/
1242 883
1243/* 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. */
1244static void 885void
1245delete_unique_items (maptile *m) 886maptile::clear_unique_items ()
1246{ 887{
1247 int i, j, unique; 888 for (int i = 0; i < size (); ++i)
1248 object *op, *next; 889 {
890 int unique = 0;
891 for (object *op = spaces [i].bot; op; )
892 {
893 object *above = op->above;
1249 894
1250 for (i = 0; i < MAP_WIDTH (m); i++) 895 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1251 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 freezer.put (KW_end);
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)
1252 { 989 {
1253 unique = 0; 990 if (op->head)
991 op = op->head;
1254 992
1255 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)
1256 { 1052 {
1257 next = op->above; 1053 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1258 1054 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
1259 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1055 continue;
1260 unique = 1;
1261
1262 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1263 {
1264 clean_object (op);
1265
1266 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1267 remove_button_link (op);
1268
1269 op->destroy ();
1270 } 1056 }
1057
1058 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1059 {
1060 update_button (ol->ob);
1061 break;
1271 } 1062 }
1272 } 1063 }
1273} 1064}
1274
1275
1276/*
1277 * Loads unique objects from file(s) into the map which is in memory
1278 * m is the map to load unique items into.
1279 */
1280static void
1281load_unique_objects (maptile *m)
1282{
1283 int count;
1284 char firstname[MAX_BUF];
1285
1286 for (count = 0; count < 10; count++)
1287 {
1288 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1289 if (!access (firstname, R_OK))
1290 break;
1291 }
1292 /* If we get here, we did not find any map */
1293 if (count == 10)
1294 return;
1295
1296 object_thawer thawer (firstname);
1297
1298 if (!thawer)
1299 return;
1300
1301 m->in_memory = MAP_LOADING;
1302 if (m->tmpname == NULL) /* if we have loaded unique items from */
1303 delete_unique_items (m); /* original map before, don't duplicate them */
1304 load_objects (m, thawer, 0);
1305
1306 m->in_memory = MAP_IN_MEMORY;
1307}
1308
1309
1310/*
1311 * Saves a map to file. If flag is set, it is saved into the same
1312 * file it was (originally) loaded from. Otherwise a temporary
1313 * filename will be genarated, and the file will be stored there.
1314 * The temporary filename will be stored in the maptileure.
1315 * If the map is unique, we also save to the filename in the map
1316 * (this should have been updated when first loaded)
1317 */
1318
1319int
1320new_save_map (maptile *m, int flag)
1321{
1322 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1323 int i;
1324
1325 if (flag && !*m->path)
1326 {
1327 LOG (llevError, "Tried to save map without path.\n");
1328 return -1;
1329 }
1330
1331 if (flag || (m->unique) || (m->templatemap))
1332 {
1333 if (!m->unique && !m->templatemap)
1334 { /* flag is set */
1335 if (flag == 2)
1336 strcpy (filename, create_overlay_pathname (m->path));
1337 else
1338 strcpy (filename, create_pathname (m->path));
1339 }
1340 else
1341 strcpy (filename, m->path);
1342
1343 make_path_to_file (filename);
1344 }
1345 else
1346 {
1347 if (!m->tmpname)
1348 m->tmpname = tempnam_local (settings.tmpdir, NULL);
1349
1350 strcpy (filename, m->tmpname);
1351 }
1352
1353 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1354 m->in_memory = MAP_SAVING;
1355
1356 object_freezer freezer;
1357
1358 /* legacy */
1359 fprintf (freezer, "arch map\n");
1360 if (m->name)
1361 fprintf (freezer, "name %s\n", m->name);
1362 if (!flag)
1363 fprintf (freezer, "swap_time %d\n", m->swap_time);
1364 if (m->reset_timeout)
1365 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1366 if (m->fixed_resettime)
1367 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1368 /* we unfortunately have no idea if this is a value the creator set
1369 * or a difficulty value we generated when the map was first loaded
1370 */
1371 if (m->difficulty)
1372 fprintf (freezer, "difficulty %d\n", m->difficulty);
1373 if (m->region)
1374 fprintf (freezer, "region %s\n", m->region->name);
1375 if (m->shopitems)
1376 {
1377 print_shop_string (m, shop);
1378 fprintf (freezer, "shopitems %s\n", shop);
1379 }
1380 if (m->shopgreed)
1381 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1382 if (m->shopmin)
1383 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1384 if (m->shopmax)
1385 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1386 if (m->shoprace)
1387 fprintf (freezer, "shoprace %s\n", m->shoprace);
1388 if (m->darkness)
1389 fprintf (freezer, "darkness %d\n", m->darkness);
1390 if (m->width)
1391 fprintf (freezer, "width %d\n", m->width);
1392 if (m->height)
1393 fprintf (freezer, "height %d\n", m->height);
1394 if (m->enter_x)
1395 fprintf (freezer, "enter_x %d\n", m->enter_x);
1396 if (m->enter_y)
1397 fprintf (freezer, "enter_y %d\n", m->enter_y);
1398 if (m->msg)
1399 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1400 if (m->maplore)
1401 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1402 if (m->unique)
1403 fprintf (freezer, "unique %d\n", m->unique);
1404 if (m->templatemap)
1405 fprintf (freezer, "template %d\n", m->templatemap);
1406 if (m->outdoor)
1407 fprintf (freezer, "outdoor %d\n", m->outdoor);
1408 if (m->temp)
1409 fprintf (freezer, "temp %d\n", m->temp);
1410 if (m->pressure)
1411 fprintf (freezer, "pressure %d\n", m->pressure);
1412 if (m->humid)
1413 fprintf (freezer, "humid %d\n", m->humid);
1414 if (m->windspeed)
1415 fprintf (freezer, "windspeed %d\n", m->windspeed);
1416 if (m->winddir)
1417 fprintf (freezer, "winddir %d\n", m->winddir);
1418 if (m->sky)
1419 fprintf (freezer, "sky %d\n", m->sky);
1420 if (m->nosmooth)
1421 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1422
1423 /* Save any tiling information, except on overlays */
1424 if (flag != 2)
1425 for (i = 0; i < 4; i++)
1426 if (m->tile_path[i])
1427 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1428
1429 freezer.put (m);
1430 fprintf (freezer, "end\n");
1431
1432 /* In the game save unique items in the different file, but
1433 * in the editor save them to the normal map file.
1434 * If unique map, save files in the proper destination (set by
1435 * player)
1436 */
1437 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1438 {
1439 object_freezer unique;
1440
1441 if (flag == 2)
1442 save_objects (m, freezer, unique, 2);
1443 else
1444 save_objects (m, freezer, unique, 0);
1445
1446 sprintf (buf, "%s.v00", create_items_path (m->path));
1447
1448 unique.save (buf);
1449 }
1450 else
1451 { /* save same file when not playing, like in editor */
1452 save_objects (m, freezer, freezer, 0);
1453 }
1454
1455 freezer.save (filename);
1456
1457 return 0;
1458}
1459
1460
1461/*
1462 * Remove and free all objects in the inventory of the given object.
1463 * object.c ?
1464 */
1465
1466void
1467clean_object (object *op)
1468{
1469 object *tmp, *next;
1470
1471 for (tmp = op->inv; tmp; tmp = next)
1472 {
1473 next = tmp->below;
1474
1475 clean_object (tmp);
1476 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1477 remove_button_link (tmp);
1478
1479 tmp->destroy ();
1480 }
1481}
1482
1483/*
1484 * Remove and free all objects in the given map.
1485 */
1486
1487void
1488free_all_objects (maptile *m)
1489{
1490 int i, j;
1491 object *op;
1492
1493 for (i = 0; i < MAP_WIDTH (m); i++)
1494 for (j = 0; j < MAP_HEIGHT (m); j++)
1495 {
1496 object *previous_obj = NULL;
1497
1498 while ((op = GET_MAP_OB (m, i, j)) != NULL)
1499 {
1500 if (op == previous_obj)
1501 {
1502 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1503 break;
1504 }
1505
1506 previous_obj = op;
1507
1508 if (op->head != NULL)
1509 op = op->head;
1510
1511 /* If the map isn't in memory, free_object will remove and
1512 * free objects in op's inventory. So let it do the job.
1513 */
1514 if (m->in_memory == MAP_IN_MEMORY)
1515 clean_object (op);
1516
1517 op->destroy ();
1518 }
1519 }
1520}
1521
1522/*
1523 * Frees everything allocated by the given maptileure.
1524 * don't free tmpname - our caller is left to do that
1525 */
1526
1527void
1528free_map (maptile *m, int flag)
1529{
1530 int i;
1531
1532 if (!m->in_memory)
1533 {
1534 LOG (llevError, "Trying to free freed map.\n");
1535 return;
1536 }
1537 if (flag && m->spaces)
1538 free_all_objects (m);
1539 if (m->name)
1540 FREE_AND_CLEAR (m->name);
1541 if (m->spaces)
1542 FREE_AND_CLEAR (m->spaces);
1543 if (m->msg)
1544 FREE_AND_CLEAR (m->msg);
1545 if (m->maplore)
1546 FREE_AND_CLEAR (m->maplore);
1547 if (m->shopitems)
1548 delete[]m->shopitems;
1549 m->shopitems = 0;
1550 if (m->shoprace)
1551 FREE_AND_CLEAR (m->shoprace);
1552 if (m->buttons)
1553 free_objectlinkpt (m->buttons);
1554 m->buttons = NULL;
1555 for (i = 0; i < 4; i++)
1556 {
1557 if (m->tile_path[i])
1558 FREE_AND_CLEAR (m->tile_path[i]);
1559 m->tile_map[i] = NULL;
1560 }
1561 m->in_memory = MAP_SWAPPED;
1562}
1563
1564/*
1565 * function: vanish maptile
1566 * m : pointer to maptile, if NULL no action
1567 * this deletes all the data on the map (freeing pointers)
1568 * and then removes this map from the global linked list of maps.
1569 */
1570
1571void
1572delete_map (maptile *m)
1573{
1574 maptile *tmp, *last;
1575 int i;
1576
1577 if (!m)
1578 return;
1579
1580 m->clear ();
1581
1582 if (m->in_memory == MAP_IN_MEMORY)
1583 {
1584 /* change to MAP_SAVING, even though we are not,
1585 * so that remove_ob doesn't do as much work.
1586 */
1587 m->in_memory = MAP_SAVING;
1588 free_map (m, 1);
1589 }
1590 /* move this out of free_map, since tmpname can still be needed if
1591 * the map is swapped out.
1592 */
1593 if (m->tmpname)
1594 {
1595 free (m->tmpname);
1596 m->tmpname = NULL;
1597 }
1598 last = NULL;
1599 /* We need to look through all the maps and see if any maps
1600 * are pointing at this one for tiling information. Since
1601 * tiling can be assymetric, we just can not look to see which
1602 * maps this map tiles with and clears those.
1603 */
1604 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1605 {
1606 if (tmp->next == m)
1607 last = tmp;
1608
1609 /* This should hopefully get unrolled on a decent compiler */
1610 for (i = 0; i < 4; i++)
1611 if (tmp->tile_map[i] == m)
1612 tmp->tile_map[i] = NULL;
1613 }
1614
1615 /* If last is null, then this should be the first map in the list */
1616 if (!last)
1617 {
1618 if (m == first_map)
1619 first_map = m->next;
1620 else
1621 /* m->path is a static char, so should hopefully still have
1622 * some useful data in it.
1623 */
1624 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1625 }
1626 else
1627 last->next = m->next;
1628
1629 delete m;
1630}
1631
1632
1633
1634/*
1635 * Makes sure the given map is loaded and swapped in.
1636 * name is path name of the map.
1637 * flags meaning:
1638 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1639 * and don't do unique items or the like.
1640 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1641 * dont do any more name translation on it.
1642 *
1643 * Returns a pointer to the given map.
1644 */
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 1065
1749/* 1066/*
1750 * 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.
1751 * difficulty does not have a lot to do with character level, 1068 * difficulty does not have a lot to do with character level,
1752 * 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.
… …
1754 * 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
1755 * 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
1756 * have a difficulty set than using this function - human calculation 1073 * have a difficulty set than using this function - human calculation
1757 * is much better than this functions guesswork. 1074 * is much better than this functions guesswork.
1758 */ 1075 */
1759
1760int 1076int
1761calculate_difficulty (maptile *m) 1077maptile::estimate_difficulty () const
1762{ 1078{
1763 object *op;
1764 archetype *at;
1765 int x, y, i;
1766 long monster_cnt = 0; 1079 long monster_cnt = 0;
1767 double avgexp = 0; 1080 double avgexp = 0;
1768 sint64 total_exp = 0; 1081 sint64 total_exp = 0;
1769 1082
1770 if (MAP_DIFFICULTY (m)) 1083 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1771 { 1084 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 { 1085 {
1780 if (QUERY_FLAG (op, FLAG_MONSTER)) 1086 if (QUERY_FLAG (op, FLAG_MONSTER))
1781 { 1087 {
1782 total_exp += op->stats.exp; 1088 total_exp += op->stats.exp;
1783 monster_cnt++; 1089 monster_cnt++;
1784 } 1090 }
1785 1091
1786 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1092 if (QUERY_FLAG (op, FLAG_GENERATOR))
1787 { 1093 {
1788 total_exp += op->stats.exp; 1094 total_exp += op->stats.exp;
1095
1789 at = type_to_archetype (GENERATE_TYPE (op)); 1096 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1790
1791 if (at != NULL)
1792 total_exp += at->clone.stats.exp * 8; 1097 total_exp += at->clone.stats.exp * 8;
1793 1098
1794 monster_cnt++; 1099 monster_cnt++;
1795 } 1100 }
1796 } 1101 }
1797 1102
1798 avgexp = (double) total_exp / monster_cnt; 1103 avgexp = (double) total_exp / monster_cnt;
1799 1104
1800 for (i = 1; i <= settings.max_level; i++) 1105 for (int i = 1; i <= settings.max_level; i++)
1801 {
1802 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))
1803 {
1804 /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1805 return i; 1107 return i;
1806 }
1807 }
1808 1108
1809 return 1; 1109 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} 1110}
1838 1111
1839/* change_map_light() - used to change map light level (darkness) 1112/* change_map_light() - used to change map light level (darkness)
1840 * up or down. Returns true if successful. It should now be 1113 * up or down. Returns true if successful. It should now be
1841 * possible to change a value by more than 1. 1114 * possible to change a value by more than 1.
1842 * 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
1843 * to maps than los. 1116 * to maps than los.
1844 * postive values make it darker, negative make it brighter 1117 * postive values make it darker, negative make it brighter
1845 */ 1118 */
1846
1847int 1119int
1848change_map_light (maptile *m, int change) 1120maptile::change_map_light (int change)
1849{ 1121{
1850 int new_level = m->darkness + change; 1122 int new_level = darkness + change;
1851 1123
1852 /* Nothing to do */ 1124 /* Nothing to do */
1853 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))
1854 {
1855 return 0; 1126 return 0;
1856 }
1857 1127
1858 /* inform all players on the map */ 1128 /* inform all players on the map */
1859 if (change > 0) 1129 if (change > 0)
1860 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); 1130 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1861 else 1131 else
1862 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); 1132 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1863 1133
1864 /* Do extra checking. since m->darkness is a unsigned value, 1134 /* Do extra checking. since darkness is a unsigned value,
1865 * we need to be extra careful about negative values. 1135 * we need to be extra careful about negative values.
1866 * In general, the checks below are only needed if change 1136 * In general, the checks below are only needed if change
1867 * is not +/-1 1137 * is not +/-1
1868 */ 1138 */
1869 if (new_level < 0) 1139 if (new_level < 0)
1870 m->darkness = 0; 1140 darkness = 0;
1871 else if (new_level >= MAX_DARKNESS) 1141 else if (new_level >= MAX_DARKNESS)
1872 m->darkness = MAX_DARKNESS; 1142 darkness = MAX_DARKNESS;
1873 else 1143 else
1874 m->darkness = new_level; 1144 darkness = new_level;
1875 1145
1876 /* All clients need to get re-updated for the change */ 1146 /* All clients need to get re-updated for the change */
1877 update_all_map_los (m); 1147 update_all_map_los (this);
1878 return 1; 1148 return 1;
1879} 1149}
1880
1881 1150
1882/* 1151/*
1883 * This function updates various attributes about a specific space 1152 * This function updates various attributes about a specific space
1884 * on the map (what it looks like, whether it blocks magic, 1153 * on the map (what it looks like, whether it blocks magic,
1885 * has a living creatures, prevents people from passing 1154 * has a living creatures, prevents people from passing
1886 * through, etc) 1155 * through, etc)
1887 */ 1156 */
1888void 1157void
1889update_position (maptile *m, int x, int y) 1158mapspace::update_ ()
1890{ 1159{
1891 object *tmp, *last = NULL; 1160 object *tmp, *last = 0;
1892 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1161 uint8 flags = 0, light = 0, anywhere = 0;
1893 New_Face *top, *floor, *middle; 1162 New_Face *top, *floor, *middle;
1894 object *top_obj, *floor_obj, *middle_obj; 1163 object *top_obj, *floor_obj, *middle_obj;
1895 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;
1896 1165
1897 oldflags = GET_MAP_FLAGS (m, x, y);
1898 if (!(oldflags & P_NEED_UPDATE))
1899 {
1900 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1901 return;
1902 }
1903
1904 middle = blank_face; 1166 middle = blank_face;
1905 top = blank_face; 1167 top = blank_face;
1906 floor = blank_face; 1168 floor = blank_face;
1907 1169
1908 middle_obj = NULL; 1170 middle_obj = 0;
1909 top_obj = NULL; 1171 top_obj = 0;
1910 floor_obj = NULL; 1172 floor_obj = 0;
1911 1173
1912 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1174 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1913 { 1175 {
1914
1915 /* This could be made additive I guess (two lights better than 1176 /* This could be made additive I guess (two lights better than
1916 * 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
1917 * light bulbs do not illuminate twice as far as once since 1178 * light bulbs do not illuminate twice as far as once since
1918 * it is a disapation factor that is squared (or is it cubed?) 1179 * it is a dissapation factor that is cubed.
1919 */ 1180 */
1920 if (tmp->glow_radius > light) 1181 if (tmp->glow_radius > light)
1921 light = tmp->glow_radius; 1182 light = tmp->glow_radius;
1922 1183
1923 /* This call is needed in order to update objects the player 1184 /* This call is needed in order to update objects the player
… …
1961 { 1222 {
1962 middle = tmp->face; 1223 middle = tmp->face;
1963 middle_obj = tmp; 1224 middle_obj = tmp;
1964 } 1225 }
1965 } 1226 }
1227
1966 if (tmp == tmp->above) 1228 if (tmp == tmp->above)
1967 { 1229 {
1968 LOG (llevError, "Error in structure of map\n"); 1230 LOG (llevError, "Error in structure of map\n");
1969 exit (-1); 1231 exit (-1);
1970 } 1232 }
1971 1233
1972 move_slow |= tmp->move_slow; 1234 move_slow |= tmp->move_slow;
1973 move_block |= tmp->move_block; 1235 move_block |= tmp->move_block;
1974 move_on |= tmp->move_on; 1236 move_on |= tmp->move_on;
1975 move_off |= tmp->move_off; 1237 move_off |= tmp->move_off;
1976 move_allow |= tmp->move_allow; 1238 move_allow |= tmp->move_allow;
1977 1239
1978 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1979 flags |= P_IS_ALIVE;
1980 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
1981 flags |= P_NO_MAGIC;
1982 if (QUERY_FLAG (tmp, FLAG_DAMNED))
1983 flags |= P_NO_CLERIC;
1984 if (tmp->type == SAFE_GROUND)
1985 flags |= P_SAFE;
1986
1987 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1240 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
1988 flags |= P_BLOCKSVIEW; 1241 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
1989 } /* for stack of objects */ 1242 if (tmp->type == PLAYER) flags |= P_PLAYER;
1990 1243 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1991 /* 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;
1992 * since we're already doing the work, we calculate them here. 1245 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1993 * if they don't match, logic is broken someplace.
1994 */
1995 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
1996 { 1246 }
1997 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1247
1998 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1248 this->light = light;
1999 } 1249 this->flags_ = flags;
2000 SET_MAP_FLAGS (m, x, y, flags); 1250 this->move_block = move_block & ~move_allow;
2001 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1251 this->move_on = move_on;
2002 SET_MAP_MOVE_ON (m, x, y, move_on); 1252 this->move_off = move_off;
2003 SET_MAP_MOVE_OFF (m, x, y, move_off); 1253 this->move_slow = move_slow;
2004 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2005 1254
2006 /* 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),
2007 * 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
2008 * this point. 1257 * this point.
2009 * middle contains the highest visibility face. 1258 * middle contains the highest visibility face.
… …
2063 break; 1312 break;
2064 } 1313 }
2065 } 1314 }
2066 } 1315 }
2067 } 1316 }
1317
2068 if (middle == floor) 1318 if (middle == floor)
2069 middle = blank_face; 1319 middle = blank_face;
1320
2070 if (top == middle) 1321 if (top == middle)
2071 middle = blank_face; 1322 middle = blank_face;
2072 SET_MAP_FACE (m, x, y, top, 0);
2073 if (top != blank_face)
2074 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2075 else
2076 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2077 SET_MAP_FACE (m, x, y, middle, 1);
2078 if (middle != blank_face)
2079 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2080 else
2081 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2082 SET_MAP_FACE (m, x, y, floor, 2);
2083 if (floor != blank_face)
2084 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2085 else
2086 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2087 SET_MAP_LIGHT (m, x, y, light);
2088}
2089 1323
2090 1324 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
2091void 1325 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
2092set_map_reset_time (maptile *map) 1326 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
2093{
2094 int timeout;
2095
2096 timeout = MAP_RESET_TIMEOUT (map);
2097 if (timeout <= 0)
2098 timeout = MAP_DEFAULTRESET;
2099 if (timeout >= MAP_MAXRESET)
2100 timeout = MAP_MAXRESET;
2101 MAP_WHEN_RESET (map) = seconds () + timeout;
2102} 1327}
2103 1328
2104/* this updates the orig_map->tile_map[tile_num] value after loading 1329/* this updates the orig_map->tile_map[tile_num] value after loading
2105 * the map. It also takes care of linking back the freshly loaded 1330 * the map. It also takes care of linking back the freshly loaded
2106 * maps tile_map values if it tiles back to this one. It returns 1331 * maps tile_map values if it tiles back to this one. It returns
2107 * the value of orig_map->tile_map[tile_num]. It really only does this 1332 * the value of orig_map->tile_map[tile_num]. It really only does this
2108 * so that it is easier for calling functions to verify success. 1333 * so that it is easier for calling functions to verify success.
2109 */ 1334 */
2110
2111static maptile * 1335static maptile *
2112load_and_link_tiled_map (maptile *orig_map, int tile_num) 1336load_and_link_tiled_map (maptile *orig_map, int tile_num)
2113{ 1337{
1338 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map);
1339
1340 if (!mp || mp->in_memory != MAP_IN_MEMORY)
1341 {
1342 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1343 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1344 &orig_map->tile_path[tile_num], &orig_map->path);
1345 mp = new maptile (1, 1);
1346 mp->alloc ();
1347 mp->in_memory = MAP_IN_MEMORY;
1348 }
1349
2114 int dest_tile = (tile_num + 2) % 4; 1350 int dest_tile = (tile_num + 2) % 4;
2115 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
2116 1351
2117 orig_map->tile_map[tile_num] = ready_map_name (path, 0); 1352 orig_map->tile_map[tile_num] = mp;
2118 1353
2119 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1354 // optimisation: back-link map to origin map if euclidean
2120 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)) 1355 //TODO: non-euclidean maps MUST GO
1356 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
2121 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1357 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
2122 1358
2123 return orig_map->tile_map[tile_num]; 1359 return mp;
2124} 1360}
2125 1361
2126/* this returns TRUE if the coordinates (x,y) are out of 1362/* this returns TRUE if the coordinates (x,y) are out of
2127 * map m. This function also takes into account any 1363 * map m. This function also takes into account any
2128 * tiling considerations, loading adjacant maps as needed. 1364 * tiling considerations, loading adjacant maps as needed.
2129 * This is the function should always be used when it 1365 * This is the function should always be used when it
2130 * necessary to check for valid coordinates. 1366 * necessary to check for valid coordinates.
2131 * This function will recursively call itself for the 1367 * This function will recursively call itself for the
2132 * tiled maps. 1368 * tiled maps.
2133 *
2134 *
2135 */ 1369 */
2136int 1370int
2137out_of_map (maptile *m, int x, int y) 1371out_of_map (maptile *m, int x, int y)
2138{ 1372{
2139
2140 /* If we get passed a null map, this is obviously the 1373 /* If we get passed a null map, this is obviously the
2141 * case. This generally shouldn't happen, but if the 1374 * case. This generally shouldn't happen, but if the
2142 * map loads fail below, it could happen. 1375 * map loads fail below, it could happen.
2143 */ 1376 */
2144 if (!m) 1377 if (!m)
… …
2146 1379
2147 if (x < 0) 1380 if (x < 0)
2148 { 1381 {
2149 if (!m->tile_path[3]) 1382 if (!m->tile_path[3])
2150 return 1; 1383 return 1;
1384
2151 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1385 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2152 {
2153 load_and_link_tiled_map (m, 3); 1386 load_and_link_tiled_map (m, 3);
2154 } 1387
2155 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 1388 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
2156 } 1389 }
2157 if (x >= MAP_WIDTH (m)) 1390
1391 if (x >= m->width)
2158 { 1392 {
2159 if (!m->tile_path[1]) 1393 if (!m->tile_path[1])
2160 return 1; 1394 return 1;
1395
2161 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1396 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2162 {
2163 load_and_link_tiled_map (m, 1); 1397 load_and_link_tiled_map (m, 1);
2164 } 1398
2165 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 1399 return out_of_map (m->tile_map[1], x - m->width, y);
2166 } 1400 }
1401
2167 if (y < 0) 1402 if (y < 0)
2168 { 1403 {
2169 if (!m->tile_path[0]) 1404 if (!m->tile_path[0])
2170 return 1; 1405 return 1;
1406
2171 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1407 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2172 {
2173 load_and_link_tiled_map (m, 0); 1408 load_and_link_tiled_map (m, 0);
2174 } 1409
2175 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 1410 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
2176 } 1411 }
2177 if (y >= MAP_HEIGHT (m)) 1412
1413 if (y >= m->height)
2178 { 1414 {
2179 if (!m->tile_path[2]) 1415 if (!m->tile_path[2])
2180 return 1; 1416 return 1;
1417
2181 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1418 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2182 {
2183 load_and_link_tiled_map (m, 2); 1419 load_and_link_tiled_map (m, 2);
2184 } 1420
2185 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 1421 return out_of_map (m->tile_map[2], x, y - m->height);
2186 } 1422 }
2187 1423
2188 /* Simple case - coordinates are within this local 1424 /* Simple case - coordinates are within this local
2189 * map. 1425 * map.
2190 */ 1426 */
… …
2198 * updates x and y to be the localized coordinates. 1434 * updates x and y to be the localized coordinates.
2199 * Using this is more efficient of calling out_of_map 1435 * Using this is more efficient of calling out_of_map
2200 * and then figuring out what the real map is 1436 * and then figuring out what the real map is
2201 */ 1437 */
2202maptile * 1438maptile *
2203get_map_from_coord (maptile *m, sint16 * x, sint16 * y) 1439get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
2204{ 1440{
2205
2206 if (*x < 0) 1441 if (*x < 0)
2207 { 1442 {
2208 if (!m->tile_path[3]) 1443 if (!m->tile_path[3])
2209 return NULL; 1444 return 0;
1445
2210 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1446 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2211 load_and_link_tiled_map (m, 3); 1447 load_and_link_tiled_map (m, 3);
2212 1448
2213 *x += MAP_WIDTH (m->tile_map[3]); 1449 *x += m->tile_map[3]->width;
2214 return (get_map_from_coord (m->tile_map[3], x, y)); 1450 return (get_map_from_coord (m->tile_map[3], x, y));
2215 } 1451 }
2216 if (*x >= MAP_WIDTH (m)) 1452
1453 if (*x >= m->width)
2217 { 1454 {
2218 if (!m->tile_path[1]) 1455 if (!m->tile_path[1])
2219 return NULL; 1456 return 0;
1457
2220 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1458 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2221 load_and_link_tiled_map (m, 1); 1459 load_and_link_tiled_map (m, 1);
2222 1460
2223 *x -= MAP_WIDTH (m); 1461 *x -= m->width;
2224 return (get_map_from_coord (m->tile_map[1], x, y)); 1462 return (get_map_from_coord (m->tile_map[1], x, y));
2225 } 1463 }
1464
2226 if (*y < 0) 1465 if (*y < 0)
2227 { 1466 {
2228 if (!m->tile_path[0]) 1467 if (!m->tile_path[0])
2229 return NULL; 1468 return 0;
1469
2230 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1470 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2231 load_and_link_tiled_map (m, 0); 1471 load_and_link_tiled_map (m, 0);
2232 1472
2233 *y += MAP_HEIGHT (m->tile_map[0]); 1473 *y += m->tile_map[0]->height;
2234 return (get_map_from_coord (m->tile_map[0], x, y)); 1474 return (get_map_from_coord (m->tile_map[0], x, y));
2235 } 1475 }
2236 if (*y >= MAP_HEIGHT (m)) 1476
1477 if (*y >= m->height)
2237 { 1478 {
2238 if (!m->tile_path[2]) 1479 if (!m->tile_path[2])
2239 return NULL; 1480 return 0;
1481
2240 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1482 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2241 load_and_link_tiled_map (m, 2); 1483 load_and_link_tiled_map (m, 2);
2242 1484
2243 *y -= MAP_HEIGHT (m); 1485 *y -= m->height;
2244 return (get_map_from_coord (m->tile_map[2], x, y)); 1486 return (get_map_from_coord (m->tile_map[2], x, y));
2245 } 1487 }
2246 1488
2247 /* Simple case - coordinates are within this local 1489 /* Simple case - coordinates are within this local
2248 * map. 1490 * map.
2249 */ 1491 */
2250
2251 return m; 1492 return m;
2252} 1493}
2253 1494
2254/** 1495/**
2255 * Return whether map2 is adjacent to map1. If so, store the distance from 1496 * Return whether map2 is adjacent to map1. If so, store the distance from
… …
2263 1504
2264 if (map1 == map2) 1505 if (map1 == map2)
2265 { 1506 {
2266 *dx = 0; 1507 *dx = 0;
2267 *dy = 0; 1508 *dy = 0;
2268
2269 } 1509 }
2270 else if (map1->tile_map[0] == map2) 1510 else if (map1->tile_map[0] == map2)
2271 { /* up */ 1511 { /* up */
2272 *dx = 0; 1512 *dx = 0;
2273 *dy = -MAP_HEIGHT (map2); 1513 *dy = -map2->height;
2274 } 1514 }
2275 else if (map1->tile_map[1] == map2) 1515 else if (map1->tile_map[1] == map2)
2276 { /* right */ 1516 { /* right */
2277 *dx = MAP_WIDTH (map1); 1517 *dx = map1->width;
2278 *dy = 0; 1518 *dy = 0;
2279 } 1519 }
2280 else if (map1->tile_map[2] == map2) 1520 else if (map1->tile_map[2] == map2)
2281 { /* down */ 1521 { /* down */
2282 *dx = 0; 1522 *dx = 0;
2283 *dy = MAP_HEIGHT (map1); 1523 *dy = map1->height;
2284 } 1524 }
2285 else if (map1->tile_map[3] == map2) 1525 else if (map1->tile_map[3] == map2)
2286 { /* left */ 1526 { /* left */
2287 *dx = -MAP_WIDTH (map2); 1527 *dx = -map2->width;
2288 *dy = 0; 1528 *dy = 0;
2289
2290 } 1529 }
2291 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1530 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2292 { /* up right */ 1531 { /* up right */
2293 *dx = MAP_WIDTH (map1->tile_map[0]); 1532 *dx = map1->tile_map[0]->width;
2294 *dy = -MAP_HEIGHT (map1->tile_map[0]); 1533 *dy = -map1->tile_map[0]->height;
2295 } 1534 }
2296 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1535 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2297 { /* up left */ 1536 { /* up left */
2298 *dx = -MAP_WIDTH (map2); 1537 *dx = -map2->width;
2299 *dy = -MAP_HEIGHT (map1->tile_map[0]); 1538 *dy = -map1->tile_map[0]->height;
2300 } 1539 }
2301 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1540 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2302 { /* right up */ 1541 { /* right up */
2303 *dx = MAP_WIDTH (map1); 1542 *dx = map1->width;
2304 *dy = -MAP_HEIGHT (map2); 1543 *dy = -map2->height;
2305 } 1544 }
2306 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1545 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2307 { /* right down */ 1546 { /* right down */
2308 *dx = MAP_WIDTH (map1); 1547 *dx = map1->width;
2309 *dy = MAP_HEIGHT (map1->tile_map[1]); 1548 *dy = map1->tile_map[1]->height;
2310 } 1549 }
2311 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1550 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2312 { /* down right */ 1551 { /* down right */
2313 *dx = MAP_WIDTH (map1->tile_map[2]); 1552 *dx = map1->tile_map[2]->width;
2314 *dy = MAP_HEIGHT (map1); 1553 *dy = map1->height;
2315 } 1554 }
2316 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1555 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2317 { /* down left */ 1556 { /* down left */
2318 *dx = -MAP_WIDTH (map2); 1557 *dx = -map2->width;
2319 *dy = MAP_HEIGHT (map1); 1558 *dy = map1->height;
2320 } 1559 }
2321 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1560 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2322 { /* left up */ 1561 { /* left up */
2323 *dx = -MAP_WIDTH (map1->tile_map[3]); 1562 *dx = -map1->tile_map[3]->width;
2324 *dy = -MAP_HEIGHT (map2); 1563 *dy = -map2->height;
2325 } 1564 }
2326 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1565 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2327 { /* left down */ 1566 { /* left down */
2328 *dx = -MAP_WIDTH (map1->tile_map[3]); 1567 *dx = -map1->tile_map[3]->width;
2329 *dy = MAP_HEIGHT (map1->tile_map[3]); 1568 *dy = map1->tile_map[3]->height;
2330
2331 } 1569 }
2332 else 1570 else
2333 { /* not "adjacent" enough */
2334 return 0; 1571 return 0;
2335 }
2336 1572
2337 return 1; 1573 return 1;
2338} 1574}
2339 1575
2340/* From map.c 1576/* From map.c
… …
2355 * be unexpected 1591 * be unexpected
2356 * 1592 *
2357 * currently, the only flag supported (0x1) is don't translate for 1593 * currently, the only flag supported (0x1) is don't translate for
2358 * closest body part of 'op1' 1594 * closest body part of 'op1'
2359 */ 1595 */
2360
2361void 1596void
2362get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1597get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2363{ 1598{
2364 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1599 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2365 { 1600 {
… …
2446 } 1681 }
2447} 1682}
2448 1683
2449/* Returns true of op1 and op2 are effectively on the same map 1684/* Returns true of op1 and op2 are effectively on the same map
2450 * (as related to map tiling). Note that this looks for a path from 1685 * (as related to map tiling). Note that this looks for a path from
2451 * op1 to op2, so if the tiled maps are assymetric and op2 has a path 1686 * op1 to op2, so if the tiled maps are asymetric and op2 has a path
2452 * to op1, this will still return false. 1687 * to op1, this will still return false.
2453 * Note we only look one map out to keep the processing simple 1688 * Note we only look one map out to keep the processing simple
2454 * and efficient. This could probably be a macro. 1689 * and efficient. This could probably be a macro.
2455 * MSW 2001-08-05 1690 * MSW 2001-08-05
2456 */ 1691 */
… …
2459{ 1694{
2460 int dx, dy; 1695 int dx, dy;
2461 1696
2462 return adjacent_map (op1->map, op2->map, &dx, &dy); 1697 return adjacent_map (op1->map, op2->map, &dx, &dy);
2463} 1698}
1699
1700object *
1701maptile::insert (object *op, int x, int y, object *originator, int flags)
1702{
1703 if (!op->flag [FLAG_REMOVED])
1704 op->remove ();
1705
1706 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1707}
1708

Diff Legend

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