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.35 by root, Sun Dec 10 01:16:27 2006 UTC vs.
Revision 1.56 by root, Sat Dec 30 10:16:10 2006 UTC

… …
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22*/
23 23
24
25#include <global.h> 24#include <global.h>
26#include <funcpoint.h> 25#include <funcpoint.h>
27 26
28#include <loader.h> 27#include <loader.h>
29#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 */ 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);
646} 611}
647 612
648maptile::maptile () 613maptile::maptile ()
649{ 614{
650 in_memory = MAP_SWAPPED; 615 in_memory = MAP_SWAPPED;
616
651 /* 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
652 * map archetype. Mimic that behaviour. 618 * map archetype. Mimic that behaviour.
653 */ 619 */
654 MAP_WIDTH (this) = 16; 620 width = 16;
655 MAP_HEIGHT (this) = 16; 621 height = 16;
656 MAP_RESET_TIMEOUT (this) = 0; 622 reset_timeout = 0;
657 MAP_TIMEOUT (this) = 300; 623 timeout = 300;
658 MAP_ENTER_X (this) = 0; 624 enter_x = 0;
659 MAP_ENTER_Y (this) = 0; 625 enter_y = 0;
660 /*set part to -1 indicating conversion to weather map not yet done */
661 MAP_WORLDPARTX (this) = -1;
662 MAP_WORLDPARTY (this) = -1;
663} 626}
664 627
665/* 628maptile::maptile (int w, int h)
666 * Allocates, initialises, and returns a pointer to a maptile.
667 * Modified to no longer take a path option which was not being
668 * used anyways. MSW 2001-07-01
669 */
670maptile *
671get_linked_map (void)
672{ 629{
673 maptile *mp, *map = new maptile; 630 in_memory = MAP_SWAPPED;
674 631
675 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;
676 638
677 if (mp == NULL) 639 alloc ();
678 first_map = map;
679 else
680 mp->next = map;
681
682 return map;
683} 640}
684 641
685/* 642/*
686 * Allocates the arrays contained in a maptile. 643 * Allocates the arrays contained in a maptile.
687 * This basically allocates the dynamic array of spaces for the 644 * This basically allocates the dynamic array of spaces for the
688 * map. 645 * map.
689 */ 646 */
690void 647void
691maptile::allocate () 648maptile::alloc ()
692{ 649{
693 in_memory = MAP_IN_MEMORY;
694
695 /* Log this condition and free the storage. We could I suppose
696 * realloc, but if the caller is presuming the data will be intact,
697 * that is their poor assumption.
698 */
699 if (spaces) 650 if (spaces)
700 {
701 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
702 free (spaces);
703 }
704
705 spaces = (MapSpace *)
706 calloc (1, width * height * sizeof (MapSpace));
707
708 if (!spaces)
709 fatal (OUT_OF_MEMORY);
710}
711
712/* Create and returns a map of the specific size. Used
713 * in random map code and the editor.
714 */
715maptile *
716get_empty_map (int sizex, int sizey)
717{
718 maptile *m = get_linked_map ();
719
720 m->width = sizex;
721 m->height = sizey;
722 m->in_memory = MAP_SWAPPED;
723 m->allocate ();
724
725 return m; 651 return;
652
653 spaces = salloc0<mapspace> (size ());
726} 654}
727 655
728/* 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
729 * 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
730 * at a later date. 658 * at a later date.
731 * Called by parse_map_headers below. 659 * Called by parse_map_headers below.
732 */ 660 */
733
734static shopitems * 661static shopitems *
735parse_shop_string (const char *input_string) 662parse_shop_string (const char *input_string)
736{ 663{
737 char *shop_string, *p, *q, *next_semicolon, *next_colon; 664 char *shop_string, *p, *q, *next_semicolon, *next_colon;
738 shopitems *items = NULL; 665 shopitems *items = NULL;
739 int i = 0, number_of_entries = 0; 666 int i = 0, number_of_entries = 0;
740 const typedata *current_type; 667 const typedata *current_type;
741 668
742 shop_string = strdup_local (input_string); 669 shop_string = strdup (input_string);
743 p = shop_string; 670 p = shop_string;
744 /* 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 */
745 while (p) 672 while (p)
746 { 673 {
747 p = strchr (p, ';'); 674 p = strchr (p, ';');
748 number_of_entries++; 675 number_of_entries++;
749 if (p) 676 if (p)
750 p++; 677 p++;
751 } 678 }
679
752 p = shop_string; 680 p = shop_string;
753 strip_endline (p); 681 strip_endline (p);
754 items = new shopitems[number_of_entries + 1]; 682 items = new shopitems[number_of_entries + 1];
755 for (i = 0; i < number_of_entries; i++) 683 for (i = 0; i < number_of_entries; i++)
756 { 684 {
757 if (!p) 685 if (!p)
758 { 686 {
759 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");
760 break; 688 break;
761 } 689 }
690
762 next_semicolon = strchr (p, ';'); 691 next_semicolon = strchr (p, ';');
763 next_colon = strchr (p, ':'); 692 next_colon = strchr (p, ':');
764 /* 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. */
765 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 694 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
766 items[i].strength = atoi (strchr (p, ':') + 1); 695 items[i].strength = atoi (strchr (p, ':') + 1);
… …
793 * 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
794 */ 723 */
795 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);
796 } 725 }
797 } 726 }
727
798 items[i].index = number_of_entries; 728 items[i].index = number_of_entries;
799 if (next_semicolon) 729 if (next_semicolon)
800 p = ++next_semicolon; 730 p = ++next_semicolon;
801 else 731 else
802 p = NULL; 732 p = NULL;
803 } 733 }
734
804 free (shop_string); 735 free (shop_string);
805 return items; 736 return items;
806} 737}
807 738
808/* 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
… …
817 for (i = 0; i < m->shopitems[0].index; i++) 748 for (i = 0; i < m->shopitems[0].index; i++)
818 { 749 {
819 if (m->shopitems[i].typenum) 750 if (m->shopitems[i].typenum)
820 { 751 {
821 if (m->shopitems[i].strength) 752 if (m->shopitems[i].strength)
822 {
823 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);
824 }
825 else 754 else
826 sprintf (tmp, "%s;", m->shopitems[i].name); 755 sprintf (tmp, "%s;", m->shopitems[i].name);
827 } 756 }
828 else 757 else
829 { 758 {
830 if (m->shopitems[i].strength) 759 if (m->shopitems[i].strength)
831 {
832 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 760 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
833 }
834 else 761 else
835 sprintf (tmp, "*"); 762 sprintf (tmp, "*");
836 } 763 }
764
837 strcat (output_string, tmp); 765 strcat (output_string, tmp);
838 } 766 }
839} 767}
840 768
841/* This loads the header information of the map. The header 769/* This loads the header information of the map. The header
… …
846 * 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
847 * sense. 775 * sense.
848 * 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
849 * 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.
850 * MSW 2001-07-01 778 * MSW 2001-07-01
851 * return 0 on success, 1 on failure.
852 */ 779 */
853 780bool
854static int 781maptile::load_header (object_thawer &thawer)
855load_map_header (object_thawer & fp, maptile *m)
856{ 782{
857 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;
858 int msgpos = 0; 784 int msgpos = 0;
859 int maplorepos = 0; 785 int maplorepos = 0;
860 786
861 while (fgets (buf, HUGE_BUF, fp) != NULL) 787 for (;;)
862 { 788 {
863 buf[HUGE_BUF - 1] = 0; 789 keyword kw = thawer.get_kv ();
864 key = buf; 790
865 while (isspace (*key)) 791 switch (kw)
866 key++;
867 if (*key == 0)
868 continue; /* empty line */
869 value = strchr (key, ' ');
870 if (!value)
871 { 792 {
872 end = strchr (key, '\n'); 793 case KW_EOF:
873 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);
874 { 802 break;
875 *end = 0; 803
804 case KW_lore: // CF+ extension
805 thawer.get_ml (KW_endlore, maplore);
876 } 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;
877 } 863 }
878 else
879 {
880 *value = 0;
881 value++;
882 end = strchr (value, '\n');
883 while (isspace (*value))
884 {
885 value++;
886 if (*value == '\0' || value == end)
887 {
888 /* Nothing but spaces. */
889 value = NULL;
890 break;
891 }
892 }
893 }
894
895 if (!end)
896 {
897 LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
898 return 1;
899 }
900
901 /* key is the field name, value is what it should be set
902 * to. We've already done the work to null terminate key,
903 * and strip off any leading spaces for both of these.
904 * We have not touched the newline at the end of the line -
905 * these are needed for some values. the end pointer
906 * points to the first of the newlines.
907 * value could be NULL! It would be easy enough to just point
908 * this to "" to prevent cores, but that would let more errors slide
909 * through.
910 *
911 * First check for entries that do not use the value parameter, then
912 * validate that value is given and check for the remaining entries
913 * that use the parameter.
914 */
915
916 if (!strcmp (key, "msg"))
917 {
918 while (fgets (buf, HUGE_BUF, fp) != NULL)
919 {
920 if (!strcmp (buf, "endmsg\n"))
921 break;
922 else
923 {
924 /* slightly more efficient than strcat */
925 strcpy (msgbuf + msgpos, buf);
926 msgpos += strlen (buf);
927 }
928 }
929 /* There are lots of maps that have empty messages (eg, msg/endmsg
930 * with nothing between). There is no reason in those cases to
931 * keep the empty message. Also, msgbuf contains garbage data
932 * when msgpos is zero, so copying it results in crashes
933 */
934 if (msgpos != 0)
935 m->msg = strdup_local (msgbuf);
936 }
937 else if (!strcmp (key, "maplore"))
938 {
939 while (fgets (buf, HUGE_BUF, fp) != NULL)
940 {
941 if (!strcmp (buf, "endmaplore\n"))
942 break;
943 else
944 {
945 /* slightly more efficient than strcat */
946 strcpy (maplorebuf + maplorepos, buf);
947 maplorepos += strlen (buf);
948 }
949 }
950 if (maplorepos != 0)
951 m->maplore = strdup_local (maplorebuf);
952 }
953 else if (!strcmp (key, "end"))
954 {
955 break;
956 }
957 else if (value == NULL)
958 {
959 LOG (llevError, "Got '%s' line without parameter in map header\n", key);
960 }
961 else if (!strcmp (key, "arch"))
962 {
963 /* This is an oddity, but not something we care about much. */
964 if (strcmp (value, "map\n"))
965 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
966 }
967 else if (!strcmp (key, "name"))
968 {
969 *end = 0;
970 m->name = strdup_local (value);
971 }
972 /* first strcmp value on these are old names supported
973 * for compatibility reasons. The new values (second) are
974 * what really should be used.
975 */
976 else if (!strcmp (key, "oid"))
977 {
978 fp.get (m, atoi (value));
979 }
980 else if (!strcmp (key, "attach"))
981 {
982 m->attach = value;
983 }
984 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
985 {
986 m->enter_x = atoi (value);
987 }
988 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
989 {
990 m->enter_y = atoi (value);
991 }
992 else if (!strcmp (key, "x") || !strcmp (key, "width"))
993 {
994 m->width = atoi (value);
995 }
996 else if (!strcmp (key, "y") || !strcmp (key, "height"))
997 {
998 m->height = atoi (value);
999 }
1000 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
1001 {
1002 m->reset_timeout = atoi (value);
1003 }
1004 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1005 {
1006 m->timeout = atoi (value);
1007 }
1008 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1009 {
1010 m->difficulty = atoi (value);
1011 }
1012 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1013 {
1014 m->darkness = atoi (value);
1015 }
1016 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1017 {
1018 m->fixed_resettime = atoi (value);
1019 }
1020 else if (!strcmp (key, "unique"))
1021 {
1022 m->unique = atoi (value);
1023 }
1024 else if (!strcmp (key, "template"))
1025 {
1026 m->templatemap = atoi (value);
1027 }
1028 else if (!strcmp (key, "region"))
1029 {
1030 m->region = get_region_by_name (value);
1031 }
1032 else if (!strcmp (key, "shopitems"))
1033 {
1034 *end = 0;
1035 m->shopitems = parse_shop_string (value);
1036 }
1037 else if (!strcmp (key, "shopgreed"))
1038 {
1039 m->shopgreed = atof (value);
1040 }
1041 else if (!strcmp (key, "shopmin"))
1042 {
1043 m->shopmin = atol (value);
1044 }
1045 else if (!strcmp (key, "shopmax"))
1046 {
1047 m->shopmax = atol (value);
1048 }
1049 else if (!strcmp (key, "shoprace"))
1050 {
1051 *end = 0;
1052 m->shoprace = strdup_local (value);
1053 }
1054 else if (!strcmp (key, "outdoor"))
1055 {
1056 m->outdoor = atoi (value);
1057 }
1058 else if (!strcmp (key, "temp"))
1059 {
1060 m->temp = atoi (value);
1061 }
1062 else if (!strcmp (key, "pressure"))
1063 {
1064 m->pressure = atoi (value);
1065 }
1066 else if (!strcmp (key, "humid"))
1067 {
1068 m->humid = atoi (value);
1069 }
1070 else if (!strcmp (key, "windspeed"))
1071 {
1072 m->windspeed = atoi (value);
1073 }
1074 else if (!strcmp (key, "winddir"))
1075 {
1076 m->winddir = atoi (value);
1077 }
1078 else if (!strcmp (key, "sky"))
1079 {
1080 m->sky = atoi (value);
1081 }
1082 else if (!strcmp (key, "nosmooth"))
1083 {
1084 m->nosmooth = atoi (value);
1085 }
1086 else if (!strncmp (key, "tile_path_", 10))
1087 {
1088 int tile = atoi (key + 10);
1089
1090 if (tile < 1 || tile > 4)
1091 {
1092 LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
1093 }
1094 else
1095 {
1096 char *path;
1097
1098 *end = 0;
1099
1100 if (m->tile_path[tile - 1])
1101 {
1102 LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
1103 free (m->tile_path[tile - 1]);
1104 m->tile_path[tile - 1] = NULL;
1105 }
1106
1107 if (check_path (value, 1) != -1)
1108 {
1109 /* The unadorned path works. */
1110 path = value;
1111 }
1112 else
1113 {
1114 /* Try again; it could be a relative exit. */
1115
1116 path = path_combine_and_normalize (m->path, value);
1117
1118 if (check_path (path, 1) == -1)
1119 {
1120 LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
1121 path = NULL;
1122 }
1123 }
1124
1125 if (editor)
1126 {
1127 /* Use the value as in the file. */
1128 m->tile_path[tile - 1] = strdup_local (value);
1129 }
1130 else if (path != NULL)
1131 {
1132 /* Use the normalized value. */
1133 m->tile_path[tile - 1] = strdup_local (path);
1134 }
1135 } /* end if tile direction (in)valid */
1136 }
1137 else
1138 {
1139 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1140 }
1141 }
1142 if (!key || strcmp (key, "end"))
1143 { 864 }
1144 LOG (llevError, "Got premature eof on map header!\n");
1145 return 1;
1146 }
1147 return 0;
1148}
1149 865
1150/* 866 abort ();
1151 * Opens the file "filename" and reads information about the map 867}
1152 * from the given file, and stores it in a newly allocated
1153 * maptile. A pointer to this structure is returned, or NULL on failure.
1154 * flags correspond to those in map.h. Main ones used are
1155 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1156 * MAP_BLOCK, in which case we block on this load. This happens in all
1157 * cases, no matter if this flag is set or not.
1158 * MAP_STYLE: style map - don't add active objects, don't add to server
1159 * managed map list.
1160 */
1161 868
1162maptile * 869bool
1163load_original_map (const char *filename, int flags) 870maptile::load_header (const char *path)
1164{ 871{
1165 maptile *m;
1166 char pathname[MAX_BUF];
1167
1168 if (flags & MAP_PLAYER_UNIQUE)
1169 strcpy (pathname, filename);
1170 else if (flags & MAP_OVERLAY)
1171 strcpy (pathname, create_overlay_pathname (filename));
1172 else
1173 strcpy (pathname, create_pathname (filename));
1174
1175 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1176
1177 object_thawer thawer (pathname); 872 object_thawer thawer (path);
1178 873
1179 if (!thawer) 874 if (!thawer)
1180 return 0; 875 return false;
1181 876
1182 m = get_linked_map (); 877 return load_header (thawer);
1183
1184 strcpy (m->path, filename);
1185 if (load_map_header (thawer, m))
1186 {
1187 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1188 delete_map (m);
1189 return NULL;
1190 }
1191
1192 m->allocate ();
1193
1194 m->in_memory = MAP_LOADING;
1195 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1196
1197 m->in_memory = MAP_IN_MEMORY;
1198 if (!MAP_DIFFICULTY (m))
1199 MAP_DIFFICULTY (m) = calculate_difficulty (m);
1200 set_map_reset_time (m);
1201 m->instantiate ();
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
1211static maptile *
1212load_temporary_map (maptile *m)
1213{
1214 char buf[MAX_BUF];
1215
1216 if (!m->tmpname)
1217 {
1218 LOG (llevError, "No temporary filename for map %s\n", m->path);
1219 strcpy (buf, m->path);
1220 delete_map (m);
1221 m = load_original_map (buf, 0);
1222 if (m == NULL)
1223 return NULL;
1224 fix_auto_apply (m); /* Chests which open as default */
1225 return m;
1226 }
1227
1228 object_thawer thawer (m->tmpname);
1229
1230 if (!thawer)
1231 {
1232 strcpy (buf, m->path);
1233 delete_map (m);
1234 m = load_original_map (buf, 0);
1235 if (!m)
1236 return NULL;
1237 fix_auto_apply (m); /* Chests which open as default */
1238 return m;
1239 }
1240
1241 if (load_map_header (thawer, m))
1242 {
1243 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1244 delete_map (m);
1245 m = load_original_map (m->path, 0);
1246 return NULL;
1247 }
1248
1249 m->allocate ();
1250
1251 m->in_memory = MAP_LOADING;
1252 load_objects (m, thawer, 0);
1253
1254 m->in_memory = MAP_IN_MEMORY;
1255 INVOKE_MAP (SWAPIN, m);
1256 return m;
1257}
1258
1259/*
1260 * Loads a map, which has been loaded earlier, from file.
1261 * Return the map object we load into (this can change from the passed
1262 * option if we can't find the original map)
1263 */
1264
1265maptile *
1266load_overlay_map (const char *filename, maptile *m)
1267{
1268 char pathname[MAX_BUF];
1269
1270 strcpy (pathname, create_overlay_pathname (filename));
1271
1272 object_thawer thawer (pathname);
1273
1274 if (!thawer)
1275 return m;
1276
1277 if (load_map_header (thawer, m))
1278 {
1279 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1280 delete_map (m);
1281 m = load_original_map (m->path, 0);
1282 return NULL;
1283 }
1284 /*m->allocate ();*/
1285
1286 m->in_memory = MAP_LOADING;
1287 load_objects (m, thawer, MAP_OVERLAY);
1288
1289 m->in_memory = MAP_IN_MEMORY;
1290 return m;
1291} 878}
1292 879
1293/****************************************************************************** 880/******************************************************************************
1294 * This is the start of unique map handling code 881 * This is the start of unique map handling code
1295 *****************************************************************************/ 882 *****************************************************************************/
1296 883
1297/* 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. */
1298static void 885void
1299delete_unique_items (maptile *m) 886maptile::clear_unique_items ()
1300{ 887{
1301 int i, j, unique; 888 for (int i = 0; i < size (); ++i)
1302 object *op, *next; 889 {
890 int unique = 0;
891 for (object *op = spaces [i].bot; op; )
892 {
893 object *above = op->above;
1303 894
1304 for (i = 0; i < MAP_WIDTH (m); i++) 895 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1305 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)
1306 { 989 {
1307 unique = 0; 990 if (op->head)
1308 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)
1309 { 1052 {
1310 next = op->above; 1053 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1311 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);
1312 unique = 1; 1055 continue;
1313 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1314 {
1315 clean_object (op);
1316 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1317 remove_button_link (op);
1318 remove_ob (op);
1319 free_object (op);
1320 } 1056 }
1057
1058 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1059 {
1060 update_button (ol->ob);
1061 break;
1321 } 1062 }
1322 } 1063 }
1323} 1064}
1324
1325
1326/*
1327 * Loads unique objects from file(s) into the map which is in memory
1328 * m is the map to load unique items into.
1329 */
1330static void
1331load_unique_objects (maptile *m)
1332{
1333 int count;
1334 char firstname[MAX_BUF];
1335
1336 for (count = 0; count < 10; count++)
1337 {
1338 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1339 if (!access (firstname, R_OK))
1340 break;
1341 }
1342 /* If we get here, we did not find any map */
1343 if (count == 10)
1344 return;
1345
1346 object_thawer thawer (firstname);
1347
1348 if (!thawer)
1349 return;
1350
1351 m->in_memory = MAP_LOADING;
1352 if (m->tmpname == NULL) /* if we have loaded unique items from */
1353 delete_unique_items (m); /* original map before, don't duplicate them */
1354 load_objects (m, thawer, 0);
1355
1356 m->in_memory = MAP_IN_MEMORY;
1357}
1358
1359
1360/*
1361 * Saves a map to file. If flag is set, it is saved into the same
1362 * file it was (originally) loaded from. Otherwise a temporary
1363 * filename will be genarated, and the file will be stored there.
1364 * The temporary filename will be stored in the maptileure.
1365 * If the map is unique, we also save to the filename in the map
1366 * (this should have been updated when first loaded)
1367 */
1368
1369int
1370new_save_map (maptile *m, int flag)
1371{
1372 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1373 int i;
1374
1375 if (flag && !*m->path)
1376 {
1377 LOG (llevError, "Tried to save map without path.\n");
1378 return -1;
1379 }
1380
1381 if (flag || (m->unique) || (m->templatemap))
1382 {
1383 if (!m->unique && !m->templatemap)
1384 { /* flag is set */
1385 if (flag == 2)
1386 strcpy (filename, create_overlay_pathname (m->path));
1387 else
1388 strcpy (filename, create_pathname (m->path));
1389 }
1390 else
1391 strcpy (filename, m->path);
1392
1393 make_path_to_file (filename);
1394 }
1395 else
1396 {
1397 if (!m->tmpname)
1398 m->tmpname = tempnam_local (settings.tmpdir, NULL);
1399
1400 strcpy (filename, m->tmpname);
1401 }
1402
1403 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1404 m->in_memory = MAP_SAVING;
1405
1406 object_freezer freezer;
1407
1408 /* legacy */
1409 fprintf (freezer, "arch map\n");
1410 if (m->name)
1411 fprintf (freezer, "name %s\n", m->name);
1412 if (!flag)
1413 fprintf (freezer, "swap_time %d\n", m->swap_time);
1414 if (m->reset_timeout)
1415 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1416 if (m->fixed_resettime)
1417 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1418 /* we unfortunately have no idea if this is a value the creator set
1419 * or a difficulty value we generated when the map was first loaded
1420 */
1421 if (m->difficulty)
1422 fprintf (freezer, "difficulty %d\n", m->difficulty);
1423 if (m->region)
1424 fprintf (freezer, "region %s\n", m->region->name);
1425 if (m->shopitems)
1426 {
1427 print_shop_string (m, shop);
1428 fprintf (freezer, "shopitems %s\n", shop);
1429 }
1430 if (m->shopgreed)
1431 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1432#ifndef WIN32
1433 if (m->shopmin)
1434 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1435 if (m->shopmax)
1436 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1437#else
1438 if (m->shopmin)
1439 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1440 if (m->shopmax)
1441 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1442#endif
1443 if (m->shoprace)
1444 fprintf (freezer, "shoprace %s\n", m->shoprace);
1445 if (m->darkness)
1446 fprintf (freezer, "darkness %d\n", m->darkness);
1447 if (m->width)
1448 fprintf (freezer, "width %d\n", m->width);
1449 if (m->height)
1450 fprintf (freezer, "height %d\n", m->height);
1451 if (m->enter_x)
1452 fprintf (freezer, "enter_x %d\n", m->enter_x);
1453 if (m->enter_y)
1454 fprintf (freezer, "enter_y %d\n", m->enter_y);
1455 if (m->msg)
1456 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1457 if (m->maplore)
1458 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1459 if (m->unique)
1460 fprintf (freezer, "unique %d\n", m->unique);
1461 if (m->templatemap)
1462 fprintf (freezer, "template %d\n", m->templatemap);
1463 if (m->outdoor)
1464 fprintf (freezer, "outdoor %d\n", m->outdoor);
1465 if (m->temp)
1466 fprintf (freezer, "temp %d\n", m->temp);
1467 if (m->pressure)
1468 fprintf (freezer, "pressure %d\n", m->pressure);
1469 if (m->humid)
1470 fprintf (freezer, "humid %d\n", m->humid);
1471 if (m->windspeed)
1472 fprintf (freezer, "windspeed %d\n", m->windspeed);
1473 if (m->winddir)
1474 fprintf (freezer, "winddir %d\n", m->winddir);
1475 if (m->sky)
1476 fprintf (freezer, "sky %d\n", m->sky);
1477 if (m->nosmooth)
1478 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1479
1480 /* Save any tiling information, except on overlays */
1481 if (flag != 2)
1482 for (i = 0; i < 4; i++)
1483 if (m->tile_path[i])
1484 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1485
1486 freezer.put (m);
1487 fprintf (freezer, "end\n");
1488
1489 /* In the game save unique items in the different file, but
1490 * in the editor save them to the normal map file.
1491 * If unique map, save files in the proper destination (set by
1492 * player)
1493 */
1494 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1495 {
1496 object_freezer unique;
1497
1498 if (flag == 2)
1499 save_objects (m, freezer, unique, 2);
1500 else
1501 save_objects (m, freezer, unique, 0);
1502
1503 sprintf (buf, "%s.v00", create_items_path (m->path));
1504
1505 unique.save (buf);
1506 }
1507 else
1508 { /* save same file when not playing, like in editor */
1509 save_objects (m, freezer, freezer, 0);
1510 }
1511
1512 freezer.save (filename);
1513
1514 return 0;
1515}
1516
1517
1518/*
1519 * Remove and free all objects in the inventory of the given object.
1520 * object.c ?
1521 */
1522
1523void
1524clean_object (object *op)
1525{
1526 object *tmp, *next;
1527
1528 for (tmp = op->inv; tmp; tmp = next)
1529 {
1530 next = tmp->below;
1531 clean_object (tmp);
1532 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1533 remove_button_link (tmp);
1534 remove_ob (tmp);
1535 free_object (tmp);
1536 }
1537}
1538
1539/*
1540 * Remove and free all objects in the given map.
1541 */
1542
1543void
1544free_all_objects (maptile *m)
1545{
1546 int i, j;
1547 object *op;
1548
1549 for (i = 0; i < MAP_WIDTH (m); i++)
1550 for (j = 0; j < MAP_HEIGHT (m); j++)
1551 {
1552 object *previous_obj = NULL;
1553
1554 while ((op = GET_MAP_OB (m, i, j)) != NULL)
1555 {
1556 if (op == previous_obj)
1557 {
1558 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1559 break;
1560 }
1561 previous_obj = op;
1562 if (op->head != NULL)
1563 op = op->head;
1564
1565 /* If the map isn't in memory, free_object will remove and
1566 * free objects in op's inventory. So let it do the job.
1567 */
1568 if (m->in_memory == MAP_IN_MEMORY)
1569 clean_object (op);
1570 remove_ob (op);
1571 free_object (op);
1572 }
1573 }
1574}
1575
1576/*
1577 * Frees everything allocated by the given maptileure.
1578 * don't free tmpname - our caller is left to do that
1579 */
1580
1581void
1582free_map (maptile *m, int flag)
1583{
1584 int i;
1585
1586 if (!m->in_memory)
1587 {
1588 LOG (llevError, "Trying to free freed map.\n");
1589 return;
1590 }
1591 if (flag && m->spaces)
1592 free_all_objects (m);
1593 if (m->name)
1594 FREE_AND_CLEAR (m->name);
1595 if (m->spaces)
1596 FREE_AND_CLEAR (m->spaces);
1597 if (m->msg)
1598 FREE_AND_CLEAR (m->msg);
1599 if (m->maplore)
1600 FREE_AND_CLEAR (m->maplore);
1601 if (m->shopitems)
1602 delete[]m->shopitems;
1603 m->shopitems = 0;
1604 if (m->shoprace)
1605 FREE_AND_CLEAR (m->shoprace);
1606 if (m->buttons)
1607 free_objectlinkpt (m->buttons);
1608 m->buttons = NULL;
1609 for (i = 0; i < 4; i++)
1610 {
1611 if (m->tile_path[i])
1612 FREE_AND_CLEAR (m->tile_path[i]);
1613 m->tile_map[i] = NULL;
1614 }
1615 m->in_memory = MAP_SWAPPED;
1616}
1617
1618/*
1619 * function: vanish maptile
1620 * m : pointer to maptile, if NULL no action
1621 * this deletes all the data on the map (freeing pointers)
1622 * and then removes this map from the global linked list of maps.
1623 */
1624
1625void
1626delete_map (maptile *m)
1627{
1628 maptile *tmp, *last;
1629 int i;
1630
1631 if (!m)
1632 return;
1633
1634 m->clear ();
1635
1636 if (m->in_memory == MAP_IN_MEMORY)
1637 {
1638 /* change to MAP_SAVING, even though we are not,
1639 * so that remove_ob doesn't do as much work.
1640 */
1641 m->in_memory = MAP_SAVING;
1642 free_map (m, 1);
1643 }
1644 /* move this out of free_map, since tmpname can still be needed if
1645 * the map is swapped out.
1646 */
1647 if (m->tmpname)
1648 {
1649 free (m->tmpname);
1650 m->tmpname = NULL;
1651 }
1652 last = NULL;
1653 /* We need to look through all the maps and see if any maps
1654 * are pointing at this one for tiling information. Since
1655 * tiling can be assymetric, we just can not look to see which
1656 * maps this map tiles with and clears those.
1657 */
1658 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1659 {
1660 if (tmp->next == m)
1661 last = tmp;
1662
1663 /* This should hopefully get unrolled on a decent compiler */
1664 for (i = 0; i < 4; i++)
1665 if (tmp->tile_map[i] == m)
1666 tmp->tile_map[i] = NULL;
1667 }
1668
1669 /* If last is null, then this should be the first map in the list */
1670 if (!last)
1671 {
1672 if (m == first_map)
1673 first_map = m->next;
1674 else
1675 /* m->path is a static char, so should hopefully still have
1676 * some useful data in it.
1677 */
1678 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1679 }
1680 else
1681 last->next = m->next;
1682
1683 delete m;
1684}
1685
1686
1687
1688/*
1689 * Makes sure the given map is loaded and swapped in.
1690 * name is path name of the map.
1691 * flags meaning:
1692 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1693 * and don't do unique items or the like.
1694 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1695 * dont do any more name translation on it.
1696 *
1697 * Returns a pointer to the given map.
1698 */
1699
1700maptile *
1701ready_map_name (const char *name, int flags)
1702{
1703 maptile *m;
1704
1705 if (!name)
1706 return (NULL);
1707
1708 /* Have we been at this level before? */
1709 m = has_been_loaded (name);
1710
1711 /* Map is good to go, so just return it */
1712 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1713 {
1714 return m;
1715 }
1716
1717 /* unique maps always get loaded from their original location, and never
1718 * a temp location. Likewise, if map_flush is set, or we have never loaded
1719 * this map, load it now. I removed the reset checking from here -
1720 * it seems the probability of a player trying to enter a map that should
1721 * reset but hasn't yet is quite low, and removing that makes this function
1722 * a bit cleaner (and players probably shouldn't rely on exact timing for
1723 * resets in any case - if they really care, they should use the 'maps command.
1724 */
1725 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1726 {
1727
1728 /* first visit or time to reset */
1729 if (m)
1730 {
1731 clean_tmp_map (m); /* Doesn't make much difference */
1732 delete_map (m);
1733 }
1734
1735 /* create and load a map */
1736 if (flags & MAP_PLAYER_UNIQUE)
1737 LOG (llevDebug, "Trying to load map %s.\n", name);
1738 else
1739 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1740
1741 //eval_pv ("$x = Event::time", 1);//D
1742 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1743 return (NULL);
1744 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1745
1746 fix_auto_apply (m); /* Chests which open as default */
1747
1748 /* If a player unique map, no extra unique object file to load.
1749 * if from the editor, likewise.
1750 */
1751 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1752 load_unique_objects (m);
1753
1754 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1755 {
1756 m = load_overlay_map (name, m);
1757 if (m == NULL)
1758 return NULL;
1759 }
1760
1761 if (flags & MAP_PLAYER_UNIQUE)
1762 INVOKE_MAP (SWAPIN, m);
1763
1764 }
1765 else
1766 {
1767 /* If in this loop, we found a temporary map, so load it up. */
1768
1769 m = load_temporary_map (m);
1770 if (m == NULL)
1771 return NULL;
1772 load_unique_objects (m);
1773
1774 clean_tmp_map (m);
1775 m->in_memory = MAP_IN_MEMORY;
1776 /* tempnam() on sun systems (probably others) uses malloc
1777 * to allocated space for the string. Free it here.
1778 * In some cases, load_temporary_map above won't find the
1779 * temporary map, and so has reloaded a new map. If that
1780 * is the case, tmpname is now null
1781 */
1782 if (m->tmpname)
1783 free (m->tmpname);
1784 m->tmpname = NULL;
1785 /* It's going to be saved anew anyway */
1786 }
1787
1788 /* Below here is stuff common to both first time loaded maps and
1789 * temp maps.
1790 */
1791
1792 decay_objects (m); /* start the decay */
1793 /* In case other objects press some buttons down */
1794 update_buttons (m);
1795 if (m->outdoor)
1796 set_darkness_map (m);
1797 /* run the weather over this map */
1798 weather_effect (name);
1799 return m;
1800}
1801
1802 1065
1803/* 1066/*
1804 * 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.
1805 * difficulty does not have a lot to do with character level, 1068 * difficulty does not have a lot to do with character level,
1806 * 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.
… …
1808 * 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
1809 * 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
1810 * have a difficulty set than using this function - human calculation 1073 * have a difficulty set than using this function - human calculation
1811 * is much better than this functions guesswork. 1074 * is much better than this functions guesswork.
1812 */ 1075 */
1813
1814int 1076int
1815calculate_difficulty (maptile *m) 1077maptile::estimate_difficulty () const
1816{ 1078{
1817 object *op;
1818 archetype *at;
1819 int x, y, i;
1820 long monster_cnt = 0; 1079 long monster_cnt = 0;
1821 double avgexp = 0; 1080 double avgexp = 0;
1822 sint64 total_exp = 0; 1081 sint64 total_exp = 0;
1823 1082
1824 if (MAP_DIFFICULTY (m)) 1083 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1825 { 1084 for (object *op = ms->bot; op; op = op->above)
1826 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m));
1827 return MAP_DIFFICULTY (m);
1828 }
1829
1830 for (x = 0; x < MAP_WIDTH (m); x++)
1831 for (y = 0; y < MAP_HEIGHT (m); y++)
1832 for (op = get_map_ob (m, x, y); op != NULL; op = op->above)
1833 { 1085 {
1834 if (QUERY_FLAG (op, FLAG_MONSTER)) 1086 if (QUERY_FLAG (op, FLAG_MONSTER))
1835 { 1087 {
1836 total_exp += op->stats.exp; 1088 total_exp += op->stats.exp;
1837 monster_cnt++; 1089 monster_cnt++;
1838 } 1090 }
1839 1091
1840 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1092 if (QUERY_FLAG (op, FLAG_GENERATOR))
1841 { 1093 {
1842 total_exp += op->stats.exp; 1094 total_exp += op->stats.exp;
1095
1843 at = type_to_archetype (GENERATE_TYPE (op)); 1096 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1844
1845 if (at != NULL)
1846 total_exp += at->clone.stats.exp * 8; 1097 total_exp += at->clone.stats.exp * 8;
1847 1098
1848 monster_cnt++; 1099 monster_cnt++;
1849 } 1100 }
1850 } 1101 }
1851 1102
1852 avgexp = (double) total_exp / monster_cnt; 1103 avgexp = (double) total_exp / monster_cnt;
1853 1104
1854 for (i = 1; i <= settings.max_level; i++) 1105 for (int i = 1; i <= settings.max_level; i++)
1855 {
1856 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))
1857 {
1858 /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1859 return i; 1107 return i;
1860 }
1861 }
1862 1108
1863 return 1; 1109 return 1;
1864}
1865
1866void
1867clean_tmp_map (maptile *m)
1868{
1869 if (m->tmpname == NULL)
1870 return;
1871 INVOKE_MAP (CLEAN, m);
1872 (void) unlink (m->tmpname);
1873}
1874
1875void
1876free_all_maps (void)
1877{
1878 int real_maps = 0;
1879
1880 while (first_map)
1881 {
1882 /* I think some of the callers above before it gets here set this to be
1883 * saving, but we still want to free this data
1884 */
1885 if (first_map->in_memory == MAP_SAVING)
1886 first_map->in_memory = MAP_IN_MEMORY;
1887 delete_map (first_map);
1888 real_maps++;
1889 }
1890 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1891} 1110}
1892 1111
1893/* change_map_light() - used to change map light level (darkness) 1112/* change_map_light() - used to change map light level (darkness)
1894 * up or down. Returns true if successful. It should now be 1113 * up or down. Returns true if successful. It should now be
1895 * possible to change a value by more than 1. 1114 * possible to change a value by more than 1.
1896 * 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
1897 * to maps than los. 1116 * to maps than los.
1898 * postive values make it darker, negative make it brighter 1117 * postive values make it darker, negative make it brighter
1899 */ 1118 */
1900
1901int 1119int
1902change_map_light (maptile *m, int change) 1120maptile::change_map_light (int change)
1903{ 1121{
1904 int new_level = m->darkness + change; 1122 int new_level = darkness + change;
1905 1123
1906 /* Nothing to do */ 1124 /* Nothing to do */
1907 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))
1908 {
1909 return 0; 1126 return 0;
1910 }
1911 1127
1912 /* inform all players on the map */ 1128 /* inform all players on the map */
1913 if (change > 0) 1129 if (change > 0)
1914 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); 1130 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1915 else 1131 else
1916 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); 1132 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1917 1133
1918 /* Do extra checking. since m->darkness is a unsigned value, 1134 /* Do extra checking. since darkness is a unsigned value,
1919 * we need to be extra careful about negative values. 1135 * we need to be extra careful about negative values.
1920 * In general, the checks below are only needed if change 1136 * In general, the checks below are only needed if change
1921 * is not +/-1 1137 * is not +/-1
1922 */ 1138 */
1923 if (new_level < 0) 1139 if (new_level < 0)
1924 m->darkness = 0; 1140 darkness = 0;
1925 else if (new_level >= MAX_DARKNESS) 1141 else if (new_level >= MAX_DARKNESS)
1926 m->darkness = MAX_DARKNESS; 1142 darkness = MAX_DARKNESS;
1927 else 1143 else
1928 m->darkness = new_level; 1144 darkness = new_level;
1929 1145
1930 /* All clients need to get re-updated for the change */ 1146 /* All clients need to get re-updated for the change */
1931 update_all_map_los (m); 1147 update_all_map_los (this);
1932 return 1; 1148 return 1;
1933} 1149}
1934
1935 1150
1936/* 1151/*
1937 * This function updates various attributes about a specific space 1152 * This function updates various attributes about a specific space
1938 * on the map (what it looks like, whether it blocks magic, 1153 * on the map (what it looks like, whether it blocks magic,
1939 * has a living creatures, prevents people from passing 1154 * has a living creatures, prevents people from passing
1940 * through, etc) 1155 * through, etc)
1941 */ 1156 */
1942void 1157void
1943update_position (maptile *m, int x, int y) 1158mapspace::update_ ()
1944{ 1159{
1945 object *tmp, *last = NULL; 1160 object *tmp, *last = 0;
1946 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1161 uint8 flags = 0, light = 0, anywhere = 0;
1947 New_Face *top, *floor, *middle; 1162 New_Face *top, *floor, *middle;
1948 object *top_obj, *floor_obj, *middle_obj; 1163 object *top_obj, *floor_obj, *middle_obj;
1949 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;
1950 1165
1951 oldflags = GET_MAP_FLAGS (m, x, y);
1952 if (!(oldflags & P_NEED_UPDATE))
1953 {
1954 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1955 return;
1956 }
1957
1958 middle = blank_face; 1166 middle = blank_face;
1959 top = blank_face; 1167 top = blank_face;
1960 floor = blank_face; 1168 floor = blank_face;
1961 1169
1962 middle_obj = NULL; 1170 middle_obj = 0;
1963 top_obj = NULL; 1171 top_obj = 0;
1964 floor_obj = NULL; 1172 floor_obj = 0;
1965 1173
1966 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1174 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1967 { 1175 {
1968
1969 /* This could be made additive I guess (two lights better than 1176 /* This could be made additive I guess (two lights better than
1970 * 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
1971 * light bulbs do not illuminate twice as far as once since 1178 * light bulbs do not illuminate twice as far as once since
1972 * it is a disapation factor that is squared (or is it cubed?) 1179 * it is a dissapation factor that is cubed.
1973 */ 1180 */
1974 if (tmp->glow_radius > light) 1181 if (tmp->glow_radius > light)
1975 light = tmp->glow_radius; 1182 light = tmp->glow_radius;
1976 1183
1977 /* This call is needed in order to update objects the player 1184 /* This call is needed in order to update objects the player
… …
2015 { 1222 {
2016 middle = tmp->face; 1223 middle = tmp->face;
2017 middle_obj = tmp; 1224 middle_obj = tmp;
2018 } 1225 }
2019 } 1226 }
1227
2020 if (tmp == tmp->above) 1228 if (tmp == tmp->above)
2021 { 1229 {
2022 LOG (llevError, "Error in structure of map\n"); 1230 LOG (llevError, "Error in structure of map\n");
2023 exit (-1); 1231 exit (-1);
2024 } 1232 }
2025 1233
2026 move_slow |= tmp->move_slow; 1234 move_slow |= tmp->move_slow;
2027 move_block |= tmp->move_block; 1235 move_block |= tmp->move_block;
2028 move_on |= tmp->move_on; 1236 move_on |= tmp->move_on;
2029 move_off |= tmp->move_off; 1237 move_off |= tmp->move_off;
2030 move_allow |= tmp->move_allow; 1238 move_allow |= tmp->move_allow;
2031 1239
2032 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2033 flags |= P_IS_ALIVE;
2034 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
2035 flags |= P_NO_MAGIC;
2036 if (QUERY_FLAG (tmp, FLAG_DAMNED))
2037 flags |= P_NO_CLERIC;
2038 if (tmp->type == SAFE_GROUND)
2039 flags |= P_SAFE;
2040
2041 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1240 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2042 flags |= P_BLOCKSVIEW; 1241 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2043 } /* for stack of objects */ 1242 if (tmp->type == PLAYER) flags |= P_PLAYER;
2044 1243 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2045 /* 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;
2046 * since we're already doing the work, we calculate them here. 1245 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
2047 * if they don't match, logic is broken someplace.
2048 */
2049 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2050 { 1246 }
2051 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1247
2052 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1248 this->light = light;
2053 } 1249 this->flags_ = flags;
2054 SET_MAP_FLAGS (m, x, y, flags); 1250 this->move_block = move_block & ~move_allow;
2055 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1251 this->move_on = move_on;
2056 SET_MAP_MOVE_ON (m, x, y, move_on); 1252 this->move_off = move_off;
2057 SET_MAP_MOVE_OFF (m, x, y, move_off); 1253 this->move_slow = move_slow;
2058 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2059 1254
2060 /* 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),
2061 * 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
2062 * this point. 1257 * this point.
2063 * middle contains the highest visibility face. 1258 * middle contains the highest visibility face.
… …
2117 break; 1312 break;
2118 } 1313 }
2119 } 1314 }
2120 } 1315 }
2121 } 1316 }
1317
2122 if (middle == floor) 1318 if (middle == floor)
2123 middle = blank_face; 1319 middle = blank_face;
1320
2124 if (top == middle) 1321 if (top == middle)
2125 middle = blank_face; 1322 middle = blank_face;
2126 SET_MAP_FACE (m, x, y, top, 0);
2127 if (top != blank_face)
2128 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2129 else
2130 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2131 SET_MAP_FACE (m, x, y, middle, 1);
2132 if (middle != blank_face)
2133 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2134 else
2135 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2136 SET_MAP_FACE (m, x, y, floor, 2);
2137 if (floor != blank_face)
2138 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2139 else
2140 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2141 SET_MAP_LIGHT (m, x, y, light);
2142}
2143 1323
1324 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1325 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1326 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1327}
2144 1328
2145void 1329void
2146set_map_reset_time (maptile *map) 1330set_map_reset_time (maptile *map)
2147{ 1331{
2148 int timeout; 1332 int timeout = map->reset_timeout;
2149 1333
2150 timeout = MAP_RESET_TIMEOUT (map);
2151 if (timeout <= 0) 1334 if (timeout <= 0)
2152 timeout = MAP_DEFAULTRESET; 1335 timeout = MAP_DEFAULTRESET;
2153 if (timeout >= MAP_MAXRESET) 1336 if (timeout >= MAP_MAXRESET)
2154 timeout = MAP_MAXRESET; 1337 timeout = MAP_MAXRESET;
2155 MAP_WHEN_RESET (map) = seconds () + timeout; 1338
1339 map->reset_time = time (0) + timeout;
2156} 1340}
2157 1341
2158/* this updates the orig_map->tile_map[tile_num] value after loading 1342/* this updates the orig_map->tile_map[tile_num] value after loading
2159 * the map. It also takes care of linking back the freshly loaded 1343 * the map. It also takes care of linking back the freshly loaded
2160 * maps tile_map values if it tiles back to this one. It returns 1344 * maps tile_map values if it tiles back to this one. It returns
2161 * the value of orig_map->tile_map[tile_num]. It really only does this 1345 * the value of orig_map->tile_map[tile_num]. It really only does this
2162 * so that it is easier for calling functions to verify success. 1346 * so that it is easier for calling functions to verify success.
2163 */ 1347 */
2164
2165static maptile * 1348static maptile *
2166load_and_link_tiled_map (maptile *orig_map, int tile_num) 1349load_and_link_tiled_map (maptile *orig_map, int tile_num)
2167{ 1350{
1351 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]);
1352 mp->load ();
1353
2168 int dest_tile = (tile_num + 2) % 4; 1354 int dest_tile = (tile_num + 2) % 4;
2169 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
2170 1355
2171 orig_map->tile_map[tile_num] = ready_map_name (path, 0); 1356 orig_map->tile_map[tile_num] = mp;
2172 1357
2173 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1358 /* need to do a strcmp here as the orig_map->path is not a shared string */
2174 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && !strcmp (orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path)) 1359 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
2175 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1360 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
2176 1361
2177 return orig_map->tile_map[tile_num]; 1362 return mp;
2178} 1363}
2179 1364
2180/* this returns TRUE if the coordinates (x,y) are out of 1365/* this returns TRUE if the coordinates (x,y) are out of
2181 * map m. This function also takes into account any 1366 * map m. This function also takes into account any
2182 * tiling considerations, loading adjacant maps as needed. 1367 * tiling considerations, loading adjacant maps as needed.
2183 * This is the function should always be used when it 1368 * This is the function should always be used when it
2184 * necessary to check for valid coordinates. 1369 * necessary to check for valid coordinates.
2185 * This function will recursively call itself for the 1370 * This function will recursively call itself for the
2186 * tiled maps. 1371 * tiled maps.
2187 *
2188 *
2189 */ 1372 */
2190int 1373int
2191out_of_map (maptile *m, int x, int y) 1374out_of_map (maptile *m, int x, int y)
2192{ 1375{
2193
2194 /* If we get passed a null map, this is obviously the 1376 /* If we get passed a null map, this is obviously the
2195 * case. This generally shouldn't happen, but if the 1377 * case. This generally shouldn't happen, but if the
2196 * map loads fail below, it could happen. 1378 * map loads fail below, it could happen.
2197 */ 1379 */
2198 if (!m) 1380 if (!m)
… …
2200 1382
2201 if (x < 0) 1383 if (x < 0)
2202 { 1384 {
2203 if (!m->tile_path[3]) 1385 if (!m->tile_path[3])
2204 return 1; 1386 return 1;
1387
2205 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1388 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2206 {
2207 load_and_link_tiled_map (m, 3); 1389 load_and_link_tiled_map (m, 3);
2208 } 1390
2209 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 1391 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
2210 } 1392 }
2211 if (x >= MAP_WIDTH (m)) 1393
1394 if (x >= m->width)
2212 { 1395 {
2213 if (!m->tile_path[1]) 1396 if (!m->tile_path[1])
2214 return 1; 1397 return 1;
1398
2215 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1399 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2216 {
2217 load_and_link_tiled_map (m, 1); 1400 load_and_link_tiled_map (m, 1);
2218 } 1401
2219 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 1402 return out_of_map (m->tile_map[1], x - m->width, y);
2220 } 1403 }
1404
2221 if (y < 0) 1405 if (y < 0)
2222 { 1406 {
2223 if (!m->tile_path[0]) 1407 if (!m->tile_path[0])
2224 return 1; 1408 return 1;
1409
2225 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1410 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2226 {
2227 load_and_link_tiled_map (m, 0); 1411 load_and_link_tiled_map (m, 0);
2228 } 1412
2229 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 1413 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
2230 } 1414 }
2231 if (y >= MAP_HEIGHT (m)) 1415
1416 if (y >= m->height)
2232 { 1417 {
2233 if (!m->tile_path[2]) 1418 if (!m->tile_path[2])
2234 return 1; 1419 return 1;
1420
2235 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1421 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2236 {
2237 load_and_link_tiled_map (m, 2); 1422 load_and_link_tiled_map (m, 2);
2238 } 1423
2239 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 1424 return out_of_map (m->tile_map[2], x, y - m->height);
2240 } 1425 }
2241 1426
2242 /* Simple case - coordinates are within this local 1427 /* Simple case - coordinates are within this local
2243 * map. 1428 * map.
2244 */ 1429 */
… …
2252 * updates x and y to be the localized coordinates. 1437 * updates x and y to be the localized coordinates.
2253 * Using this is more efficient of calling out_of_map 1438 * Using this is more efficient of calling out_of_map
2254 * and then figuring out what the real map is 1439 * and then figuring out what the real map is
2255 */ 1440 */
2256maptile * 1441maptile *
2257get_map_from_coord (maptile *m, sint16 * x, sint16 * y) 1442get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
2258{ 1443{
2259
2260 if (*x < 0) 1444 if (*x < 0)
2261 { 1445 {
2262 if (!m->tile_path[3]) 1446 if (!m->tile_path[3])
2263 return NULL; 1447 return 0;
1448
2264 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1449 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2265 load_and_link_tiled_map (m, 3); 1450 load_and_link_tiled_map (m, 3);
2266 1451
2267 *x += MAP_WIDTH (m->tile_map[3]); 1452 *x += m->tile_map[3]->width;
2268 return (get_map_from_coord (m->tile_map[3], x, y)); 1453 return (get_map_from_coord (m->tile_map[3], x, y));
2269 } 1454 }
2270 if (*x >= MAP_WIDTH (m)) 1455
1456 if (*x >= m->width)
2271 { 1457 {
2272 if (!m->tile_path[1]) 1458 if (!m->tile_path[1])
2273 return NULL; 1459 return 0;
1460
2274 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1461 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2275 load_and_link_tiled_map (m, 1); 1462 load_and_link_tiled_map (m, 1);
2276 1463
2277 *x -= MAP_WIDTH (m); 1464 *x -= m->width;
2278 return (get_map_from_coord (m->tile_map[1], x, y)); 1465 return (get_map_from_coord (m->tile_map[1], x, y));
2279 } 1466 }
1467
2280 if (*y < 0) 1468 if (*y < 0)
2281 { 1469 {
2282 if (!m->tile_path[0]) 1470 if (!m->tile_path[0])
2283 return NULL; 1471 return 0;
1472
2284 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1473 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2285 load_and_link_tiled_map (m, 0); 1474 load_and_link_tiled_map (m, 0);
2286 1475
2287 *y += MAP_HEIGHT (m->tile_map[0]); 1476 *y += m->tile_map[0]->height;
2288 return (get_map_from_coord (m->tile_map[0], x, y)); 1477 return (get_map_from_coord (m->tile_map[0], x, y));
2289 } 1478 }
2290 if (*y >= MAP_HEIGHT (m)) 1479
1480 if (*y >= m->height)
2291 { 1481 {
2292 if (!m->tile_path[2]) 1482 if (!m->tile_path[2])
2293 return NULL; 1483 return 0;
1484
2294 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1485 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2295 load_and_link_tiled_map (m, 2); 1486 load_and_link_tiled_map (m, 2);
2296 1487
2297 *y -= MAP_HEIGHT (m); 1488 *y -= m->height;
2298 return (get_map_from_coord (m->tile_map[2], x, y)); 1489 return (get_map_from_coord (m->tile_map[2], x, y));
2299 } 1490 }
2300 1491
2301 /* Simple case - coordinates are within this local 1492 /* Simple case - coordinates are within this local
2302 * map. 1493 * map.
2303 */ 1494 */
2304 1495
1496 m->last_access = runtime;
2305 return m; 1497 return m;
2306} 1498}
2307 1499
2308/** 1500/**
2309 * Return whether map2 is adjacent to map1. If so, store the distance from 1501 * Return whether map2 is adjacent to map1. If so, store the distance from
… …
2317 1509
2318 if (map1 == map2) 1510 if (map1 == map2)
2319 { 1511 {
2320 *dx = 0; 1512 *dx = 0;
2321 *dy = 0; 1513 *dy = 0;
2322
2323 } 1514 }
2324 else if (map1->tile_map[0] == map2) 1515 else if (map1->tile_map[0] == map2)
2325 { /* up */ 1516 { /* up */
2326 *dx = 0; 1517 *dx = 0;
2327 *dy = -MAP_HEIGHT (map2); 1518 *dy = -map2->height;
2328 } 1519 }
2329 else if (map1->tile_map[1] == map2) 1520 else if (map1->tile_map[1] == map2)
2330 { /* right */ 1521 { /* right */
2331 *dx = MAP_WIDTH (map1); 1522 *dx = map1->width;
2332 *dy = 0; 1523 *dy = 0;
2333 } 1524 }
2334 else if (map1->tile_map[2] == map2) 1525 else if (map1->tile_map[2] == map2)
2335 { /* down */ 1526 { /* down */
2336 *dx = 0; 1527 *dx = 0;
2337 *dy = MAP_HEIGHT (map1); 1528 *dy = map1->height;
2338 } 1529 }
2339 else if (map1->tile_map[3] == map2) 1530 else if (map1->tile_map[3] == map2)
2340 { /* left */ 1531 { /* left */
2341 *dx = -MAP_WIDTH (map2); 1532 *dx = -map2->width;
2342 *dy = 0; 1533 *dy = 0;
2343
2344 } 1534 }
2345 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1535 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2346 { /* up right */ 1536 { /* up right */
2347 *dx = MAP_WIDTH (map1->tile_map[0]); 1537 *dx = map1->tile_map[0]->width;
2348 *dy = -MAP_HEIGHT (map1->tile_map[0]); 1538 *dy = -map1->tile_map[0]->height;
2349 } 1539 }
2350 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1540 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2351 { /* up left */ 1541 { /* up left */
2352 *dx = -MAP_WIDTH (map2); 1542 *dx = -map2->width;
2353 *dy = -MAP_HEIGHT (map1->tile_map[0]); 1543 *dy = -map1->tile_map[0]->height;
2354 } 1544 }
2355 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1545 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2356 { /* right up */ 1546 { /* right up */
2357 *dx = MAP_WIDTH (map1); 1547 *dx = map1->width;
2358 *dy = -MAP_HEIGHT (map2); 1548 *dy = -map2->height;
2359 } 1549 }
2360 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1550 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2361 { /* right down */ 1551 { /* right down */
2362 *dx = MAP_WIDTH (map1); 1552 *dx = map1->width;
2363 *dy = MAP_HEIGHT (map1->tile_map[1]); 1553 *dy = map1->tile_map[1]->height;
2364 } 1554 }
2365 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1555 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2366 { /* down right */ 1556 { /* down right */
2367 *dx = MAP_WIDTH (map1->tile_map[2]); 1557 *dx = map1->tile_map[2]->width;
2368 *dy = MAP_HEIGHT (map1); 1558 *dy = map1->height;
2369 } 1559 }
2370 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1560 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2371 { /* down left */ 1561 { /* down left */
2372 *dx = -MAP_WIDTH (map2); 1562 *dx = -map2->width;
2373 *dy = MAP_HEIGHT (map1); 1563 *dy = map1->height;
2374 } 1564 }
2375 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1565 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2376 { /* left up */ 1566 { /* left up */
2377 *dx = -MAP_WIDTH (map1->tile_map[3]); 1567 *dx = -map1->tile_map[3]->width;
2378 *dy = -MAP_HEIGHT (map2); 1568 *dy = -map2->height;
2379 } 1569 }
2380 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1570 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2381 { /* left down */ 1571 { /* left down */
2382 *dx = -MAP_WIDTH (map1->tile_map[3]); 1572 *dx = -map1->tile_map[3]->width;
2383 *dy = MAP_HEIGHT (map1->tile_map[3]); 1573 *dy = map1->tile_map[3]->height;
2384
2385 } 1574 }
2386 else 1575 else
2387 { /* not "adjacent" enough */
2388 return 0; 1576 return 0;
2389 }
2390 1577
2391 return 1; 1578 return 1;
2392} 1579}
2393 1580
2394/* From map.c 1581/* From map.c
… …
2409 * be unexpected 1596 * be unexpected
2410 * 1597 *
2411 * currently, the only flag supported (0x1) is don't translate for 1598 * currently, the only flag supported (0x1) is don't translate for
2412 * closest body part of 'op1' 1599 * closest body part of 'op1'
2413 */ 1600 */
2414
2415void 1601void
2416get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1602get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2417{ 1603{
2418 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1604 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2419 { 1605 {
… …
2500 } 1686 }
2501} 1687}
2502 1688
2503/* Returns true of op1 and op2 are effectively on the same map 1689/* Returns true of op1 and op2 are effectively on the same map
2504 * (as related to map tiling). Note that this looks for a path from 1690 * (as related to map tiling). Note that this looks for a path from
2505 * op1 to op2, so if the tiled maps are assymetric and op2 has a path 1691 * op1 to op2, so if the tiled maps are asymetric and op2 has a path
2506 * to op1, this will still return false. 1692 * to op1, this will still return false.
2507 * Note we only look one map out to keep the processing simple 1693 * Note we only look one map out to keep the processing simple
2508 * and efficient. This could probably be a macro. 1694 * and efficient. This could probably be a macro.
2509 * MSW 2001-08-05 1695 * MSW 2001-08-05
2510 */ 1696 */
… …
2513{ 1699{
2514 int dx, dy; 1700 int dx, dy;
2515 1701
2516 return adjacent_map (op1->map, op2->map, &dx, &dy); 1702 return adjacent_map (op1->map, op2->map, &dx, &dy);
2517} 1703}
1704
1705object *
1706maptile::insert (object *op, int x, int y, object *originator, int flags)
1707{
1708 if (!op->flag [FLAG_REMOVED])
1709 op->remove ();
1710
1711 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1712}
1713

Diff Legend

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