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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines