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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines