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.36 by root, Mon Dec 11 02:41:25 2006 UTC vs.
Revision 1.61 by root, Sun Dec 31 17:17:22 2006 UTC

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

Diff Legend

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