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.42 by root, Wed Dec 13 02:55:49 2006 UTC vs.
Revision 1.67 by elmex, Wed Jan 3 02:51:09 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines