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.39 by root, Tue Dec 12 20:53:02 2006 UTC vs.
Revision 1.71 by pippijn, Sat Jan 6 14:42:29 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines