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.51 by root, Mon Dec 25 17:11:16 2006 UTC vs.
Revision 1.73 by root, Sun Jan 14 18:00:33 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 * Returns the maptile which has a name matching the given argument.
35 * return NULL if no match is found.
36 */
37maptile *
38has_been_loaded (const char *name)
39{
40 maptile *map;
41
42 if (!name || !*name)
43 return 0;
44
45 for (map = first_map; map; map = map->next)
46 if (!strcmp (name, map->path))
47 break;
48
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", m->width, m->height, m->enter_x, m->enter_y);
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; m = m->next)
229 dump_map (m);
230} 97}
231 98
232/* This rolls up wall, blocks_magic, blocks_view, etc, all into 99/* This rolls up wall, blocks_magic, blocks_view, etc, all into
233 * one function that just returns a P_.. value (see map.h) 100 * one function that just returns a P_.. value (see map.h)
234 * it will also do map translation for tiled maps, returning 101 * it will also do map translation for tiled maps, returning
240 * don't expect to insert/remove anything from those spaces. 107 * don't expect to insert/remove anything from those spaces.
241 */ 108 */
242int 109int
243get_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)
244{ 111{
245 sint16 newx, newy;
246 int retval = 0;
247 maptile *mp;
248
249 newx = x; 112 sint16 newx = x;
250 newy = y; 113 sint16 newy = y;
251 114
252 mp = get_map_from_coord (oldmap, &newx, &newy); 115 maptile *mp = get_map_from_coord (oldmap, &newx, &newy);
253 116
254 if (!mp) 117 if (!mp)
255 return P_OUT_OF_MAP; 118 return P_OUT_OF_MAP;
256
257 if (mp != oldmap)
258 retval |= P_NEW_MAP;
259 119
260 if (newmap) *newmap = mp; 120 if (newmap) *newmap = mp;
261 if (nx) *nx = newx; 121 if (nx) *nx = newx;
262 if (ny) *ny = newy; 122 if (ny) *ny = newy;
263 123
264 return retval | mp->at (newx, newy).flags (); 124 return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
265} 125}
266 126
267/* 127/*
268 * Returns true if the given coordinate is blocked except by the 128 * Returns true if the given coordinate is blocked except by the
269 * object passed is not blocking. This is used with 129 * object passed is not blocking. This is used with
403 archetype *tmp; 263 archetype *tmp;
404 int flag; 264 int flag;
405 maptile *m1; 265 maptile *m1;
406 sint16 sx, sy; 266 sint16 sx, sy;
407 267
408 if (ob == NULL) 268 if (!ob)
409 { 269 {
410 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 270 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
411 if (flag & P_OUT_OF_MAP) 271 if (flag & P_OUT_OF_MAP)
412 return P_OUT_OF_MAP; 272 return P_OUT_OF_MAP;
413 273
423 return P_OUT_OF_MAP; 283 return P_OUT_OF_MAP;
424 if (flag & P_IS_ALIVE) 284 if (flag & P_IS_ALIVE)
425 return P_IS_ALIVE; 285 return P_IS_ALIVE;
426 286
427 mapspace &ms = m1->at (sx, sy); 287 mapspace &ms = m1->at (sx, sy);
428
429 288
430 /* find_first_free_spot() calls this function. However, often 289 /* find_first_free_spot() calls this function. However, often
431 * 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)
432 * 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.
433 */ 292 */
449 * 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
450 * and insert them properly. 309 * and insert them properly.
451 * The object 'container' is the object that contains the inventory. 310 * The object 'container' is the object that contains the inventory.
452 * This is needed so that we can update the containers weight. 311 * This is needed so that we can update the containers weight.
453 */ 312 */
454
455void 313void
456fix_container (object *container) 314fix_container (object *container)
457{ 315{
458 object *tmp = container->inv, *next; 316 object *tmp = container->inv, *next;
459 317
460 container->inv = NULL; 318 container->inv = 0;
461 while (tmp != NULL) 319 while (tmp)
462 { 320 {
463 next = tmp->below; 321 next = tmp->below;
464 if (tmp->inv) 322 if (tmp->inv)
465 fix_container (tmp); 323 fix_container (tmp);
324
466 (void) insert_ob_in_ob (tmp, container); 325 insert_ob_in_ob (tmp, container);
467 tmp = next; 326 tmp = next;
468 } 327 }
328
469 /* 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
470 * carrying. 330 * carrying.
471 */ 331 */
472 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;
473} 344}
474 345
475/* 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
476 * 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
477 * 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
478 * 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
479 * the more sections and not re-add sections for them. 350 * the more sections and not re-add sections for them.
480 */ 351 */
481 352void
482static void 353maptile::link_multipart_objects ()
483link_multipart_objects (maptile *m)
484{ 354{
485 int x, y; 355 if (!spaces)
486 object *tmp, *op, *last, *above; 356 return;
487 archetype *at;
488 357
489 for (x = 0; x < m->width; x++) 358 for (mapspace *ms = spaces + size (); ms-- > spaces; )
490 for (y = 0; y < m->height; y++) 359 for (object *tmp = ms->bot; tmp; )
491 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
492 { 360 {
493 above = tmp->above; 361 object *above = tmp->above;
494 362
495 /* already multipart - don't do anything more */ 363 /* already multipart - don't do anything more */
496 if (tmp->head || tmp->more) 364 if (!tmp->head && !tmp->more)
497 continue; 365 {
498
499 /* If there is nothing more to this object, this for loop 366 /* If there is nothing more to this object, this for loop
500 * won't do anything. 367 * won't do anything.
501 */ 368 */
502 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)
503 { 374 {
504 op = arch_to_object (at); 375 op = arch_to_object (at);
505 376
506 /* update x,y coordinates */ 377 /* update x,y coordinates */
507 op->x += tmp->x; 378 op->x += tmp->x;
508 op->y += tmp->y; 379 op->y += tmp->y;
509 op->head = tmp; 380 op->head = tmp;
510 op->map = m; 381 op->map = this;
511 last->more = op; 382 last->more = op;
512 op->name = tmp->name; 383 op->name = tmp->name;
513 op->title = tmp->title; 384 op->title = tmp->title;
385
514 /* we could link all the parts onto tmp, and then just 386 /* we could link all the parts onto tmp, and then just
515 * 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,
516 * 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
517 * 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.
518 */ 390 */
519 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);
520 } /* for at = tmp->arch->more */ 392 }
521 } /* for objects on this space */ 393 }
394
395 tmp = above;
396 }
522} 397}
523 398
524/* 399/*
525 * 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
526 * file pointer. 401 * file pointer.
527 * mapflags is the same as we get with load_original_map 402 * mapflags is the same as we get with load_original_map
528 */ 403 */
529void 404bool
530load_objects (maptile *m, object_thawer & fp, int mapflags) 405maptile::_load_objects (object_thawer &thawer)
531{ 406{
532 int i, j;
533 int unique; 407 int unique;
534 object *op, *prev = NULL, *last_more = NULL, *otmp; 408 object *op, *prev = NULL, *last_more = NULL, *otmp;
535 409
536 op = object::create (); 410 op = object::create ();
537 op->map = m; /* To handle buttons correctly */ 411 op->map = this; /* To handle buttons correctly */
538 412
539 while ((i = load_object (fp, op, mapflags))) 413 while (int i = load_object (thawer, op, 0))
540 { 414 {
541 /* if the archetype for the object is null, means that we 415 /* if the archetype for the object is null, means that we
542 * 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
543 * 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.
544 */ 418 */
549 } 423 }
550 424
551 switch (i) 425 switch (i)
552 { 426 {
553 case LL_NORMAL: 427 case LL_NORMAL:
554 /* if we are loading an overlay, put the floors on the bottom */
555 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
556 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
557 else
558 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);
559 429
560 if (op->inv) 430 if (op->inv)
561 sum_weight (op); 431 sum_weight (op);
562 432
563 prev = op, last_more = op; 433 prev = op, last_more = op;
564 break; 434 break;
565 435
566 case LL_MORE: 436 case LL_MORE:
567 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);
568 op->head = prev, last_more->more = op, last_more = op; 438 op->head = prev, last_more->more = op, last_more = op;
569 break; 439 break;
570 } 440 }
571 441
572 if (mapflags & MAP_STYLE)
573 remove_from_active_list (op);
574
575 op = object::create (); 442 op = object::create ();
576 op->map = m; 443 op->map = this;
577 }
578
579 for (i = 0; i < m->width; i++)
580 {
581 for (j = 0; j < m->height; j++)
582 {
583 unique = 0;
584 /* check for unique items, or unique squares */
585 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
586 {
587 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
588 unique = 1;
589
590 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
591 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
592 }
593 }
594 } 444 }
595 445
596 op->destroy (); 446 op->destroy ();
597 link_multipart_objects (m);
598}
599 447
600/* This saves all the objects on the map in a non destructive fashion. 448#if 0
601 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
602 * and we only save the head of multi part objects - this is needed
603 * in order to do map tiling properly.
604 */
605void
606save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
607{
608 int i, j = 0, unique = 0;
609 object *op;
610
611 /* first pass - save one-part objects */
612 for (i = 0; i < m->width; i++) 449 for (i = 0; i < width; i++)
613 for (j = 0; j < m->height; j++) 450 for (j = 0; j < height; j++)
614 { 451 {
615 unique = 0; 452 unique = 0;
616 453 /* check for unique items, or unique squares */
617 for (op = m->at (i, j).bot; op; op = op->above) 454 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
618 { 455 {
619 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 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 continue; 460 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
624
625 if (op->head || op->owner)
626 continue;
627
628 if (unique || op->flag [FLAG_UNIQUE])
629 save_object (fp2, op, 1);
630 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
631 save_object (fp, op, 1);
632 } 461 }
633 } 462 }
463#endif
464
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 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
504 if (cede_count >= 500)
505 {
506 cede_count = 0;
507 coroapi::cede ();
508 }
509#endif
510
511 int unique = 0;
512 for (object *op = spaces [i].bot; op; op = op->above)
513 {
514 // count per-object, but cede only when modification-safe
515 cede_count++;
516
517 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
518 unique = 1;
519
520 if (!op->can_map_save ())
521 continue;
522
523 if (unique || op->flag [FLAG_UNIQUE])
524 {
525 if (flags & IO_UNIQUES)
526 save_object (freezer, op, 1);
527 }
528 else if (flags & IO_OBJECTS)
529 save_object (freezer, op, 1);
530 }
531 }
532
533 return true;
534}
535
536bool
537maptile::_load_objects (const char *path, bool skip_header)
538{
539 object_thawer thawer (path);
540
541 if (!thawer)
542 return false;
543
544 if (skip_header)
545 for (;;)
546 {
547 keyword kw = thawer.get_kv ();
548
549 if (kw == KW_end)
550 break;
551
552 thawer.skip_kv (kw);
553 }
554
555 return _load_objects (thawer);
556}
557
558bool
559maptile::_save_objects (const char *path, int flags)
560{
561 object_freezer freezer;
562
563 if (!_save_objects (freezer, flags))
564 return false;
565
566 return freezer.save (path);
634} 567}
635 568
636maptile::maptile () 569maptile::maptile ()
637{ 570{
638 in_memory = MAP_SWAPPED; 571 in_memory = MAP_SWAPPED;
572
639 /* The maps used to pick up default x and y values from the 573 /* The maps used to pick up default x and y values from the
640 * map archetype. Mimic that behaviour. 574 * map archetype. Mimic that behaviour.
641 */ 575 */
642 this->width = 16; 576 width = 16;
643 this->height = 16; 577 height = 16;
644 this->reset_timeout = 0; 578 reset_timeout = 0;
645 this->timeout = 300; 579 timeout = 300;
646 this->enter_x = 0; 580 enter_x = 0;
647 this->enter_y = 0; 581 enter_y = 0;
648 /*set part to -1 indicating conversion to weather map not yet done */
649 this->worldpartx = -1;
650 this->worldparty = -1;
651} 582}
652 583
653/* 584maptile::maptile (int w, int h)
654 * Allocates, initialises, and returns a pointer to a maptile.
655 * Modified to no longer take a path option which was not being
656 * used anyways. MSW 2001-07-01
657 */
658maptile *
659get_linked_map (void)
660{ 585{
661 maptile *mp, *map = new maptile; 586 in_memory = MAP_SWAPPED;
662 587
663 for (mp = first_map; mp && mp->next; mp = mp->next); 588 width = w;
589 height = h;
590 reset_timeout = 0;
591 timeout = 300;
592 enter_x = 0;
593 enter_y = 0;
664 594
665 if (mp == NULL) 595 alloc ();
666 first_map = map;
667 else
668 mp->next = map;
669
670 return map;
671} 596}
672 597
673/* 598/*
674 * Allocates the arrays contained in a maptile. 599 * Allocates the arrays contained in a maptile.
675 * This basically allocates the dynamic array of spaces for the 600 * This basically allocates the dynamic array of spaces for the
676 * map. 601 * map.
677 */ 602 */
678void 603void
679maptile::allocate () 604maptile::alloc ()
680{ 605{
681 in_memory = MAP_IN_MEMORY;
682
683 /* Log this condition and free the storage. We could I suppose
684 * realloc, but if the caller is presuming the data will be intact,
685 * that is their poor assumption.
686 */
687 if (spaces) 606 if (spaces)
688 {
689 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
690 free (spaces);
691 }
692
693 spaces = (mapspace *)
694 calloc (1, width * height * sizeof (mapspace));
695
696 if (!spaces)
697 fatal (OUT_OF_MEMORY);
698}
699
700/* Create and returns a map of the specific size. Used
701 * in random map code and the editor.
702 */
703maptile *
704get_empty_map (int sizex, int sizey)
705{
706 maptile *m = get_linked_map ();
707
708 m->width = sizex;
709 m->height = sizey;
710 m->in_memory = MAP_SWAPPED;
711 m->allocate ();
712
713 return m; 607 return;
608
609 spaces = salloc0<mapspace> (size ());
714} 610}
715 611
716/* Takes a string from a map definition and outputs a pointer to the array of shopitems 612/* Takes a string from a map definition and outputs a pointer to the array of shopitems
717 * corresponding to that string. Memory is allocated for this, it must be freed 613 * corresponding to that string. Memory is allocated for this, it must be freed
718 * at a later date. 614 * at a later date.
719 * Called by parse_map_headers below. 615 * Called by parse_map_headers below.
720 */ 616 */
721
722static shopitems * 617static shopitems *
723parse_shop_string (const char *input_string) 618parse_shop_string (const char *input_string)
724{ 619{
725 char *shop_string, *p, *q, *next_semicolon, *next_colon; 620 char *shop_string, *p, *q, *next_semicolon, *next_colon;
726 shopitems *items = NULL; 621 shopitems *items = NULL;
735 p = strchr (p, ';'); 630 p = strchr (p, ';');
736 number_of_entries++; 631 number_of_entries++;
737 if (p) 632 if (p)
738 p++; 633 p++;
739 } 634 }
635
740 p = shop_string; 636 p = shop_string;
741 strip_endline (p); 637 strip_endline (p);
742 items = new shopitems[number_of_entries + 1]; 638 items = new shopitems[number_of_entries + 1];
743 for (i = 0; i < number_of_entries; i++) 639 for (i = 0; i < number_of_entries; i++)
744 { 640 {
745 if (!p) 641 if (!p)
746 { 642 {
747 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); 643 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
748 break; 644 break;
749 } 645 }
646
750 next_semicolon = strchr (p, ';'); 647 next_semicolon = strchr (p, ';');
751 next_colon = strchr (p, ':'); 648 next_colon = strchr (p, ':');
752 /* if there is a stregth specified, figure out what it is, we'll need it soon. */ 649 /* if there is a stregth specified, figure out what it is, we'll need it soon. */
753 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 650 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
754 items[i].strength = atoi (strchr (p, ':') + 1); 651 items[i].strength = atoi (strchr (p, ':') + 1);
781 * the next entry while we're at it, better print a warning 678 * the next entry while we're at it, better print a warning
782 */ 679 */
783 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); 680 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
784 } 681 }
785 } 682 }
683
786 items[i].index = number_of_entries; 684 items[i].index = number_of_entries;
787 if (next_semicolon) 685 if (next_semicolon)
788 p = ++next_semicolon; 686 p = ++next_semicolon;
789 else 687 else
790 p = NULL; 688 p = NULL;
791 } 689 }
690
792 free (shop_string); 691 free (shop_string);
793 return items; 692 return items;
794} 693}
795 694
796/* opposite of parse string, this puts the string that was originally fed in to 695/* opposite of parse string, this puts the string that was originally fed in to
805 for (i = 0; i < m->shopitems[0].index; i++) 704 for (i = 0; i < m->shopitems[0].index; i++)
806 { 705 {
807 if (m->shopitems[i].typenum) 706 if (m->shopitems[i].typenum)
808 { 707 {
809 if (m->shopitems[i].strength) 708 if (m->shopitems[i].strength)
810 {
811 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 709 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
812 }
813 else 710 else
814 sprintf (tmp, "%s;", m->shopitems[i].name); 711 sprintf (tmp, "%s;", m->shopitems[i].name);
815 } 712 }
816 else 713 else
817 { 714 {
818 if (m->shopitems[i].strength) 715 if (m->shopitems[i].strength)
819 {
820 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 716 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
821 }
822 else 717 else
823 sprintf (tmp, "*"); 718 sprintf (tmp, "*");
824 } 719 }
720
825 strcat (output_string, tmp); 721 strcat (output_string, tmp);
826 } 722 }
827} 723}
828 724
829/* This loads the header information of the map. The header 725/* This loads the header information of the map. The header
834 * put all the stuff in the map object so that names actually make 730 * put all the stuff in the map object so that names actually make
835 * sense. 731 * sense.
836 * This could be done in lex (like the object loader), but I think 732 * This could be done in lex (like the object loader), but I think
837 * currently, there are few enough fields this is not a big deal. 733 * currently, there are few enough fields this is not a big deal.
838 * MSW 2001-07-01 734 * MSW 2001-07-01
839 * return 0 on success, 1 on failure.
840 */ 735 */
841 736bool
842static int 737maptile::_load_header (object_thawer &thawer)
843load_map_header (object_thawer & fp, maptile *m)
844{ 738{
845 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; 739 for (;;)
846 int msgpos = 0;
847 int maplorepos = 0;
848
849 while (fgets (buf, HUGE_BUF, fp) != NULL)
850 { 740 {
851 buf[HUGE_BUF - 1] = 0; 741 keyword kw = thawer.get_kv ();
852 key = buf;
853 742
854 while (isspace (*key)) 743 switch (kw)
855 key++;
856
857 if (*key == 0)
858 continue; /* empty line */
859
860 value = strchr (key, ' ');
861
862 if (!value)
863 { 744 {
864 if ((end = strchr (key, '\n'))) 745 case KW_EOF:
865 *end = 0; 746 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
747 return false;
748
749 case KW_end:
750 return true;
751
752 default:
753 case KW_ERROR:
754 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
755 break;
756
757 case KW_msg:
758 thawer.get_ml (KW_endmsg, msg);
759 break;
760
761 case KW_lore: // CF+ extension
762 thawer.get_ml (KW_endlore, maplore);
763 break;
764
765 case KW_maplore:
766 thawer.get_ml (KW_endmaplore, maplore);
767 break;
768
769 case KW_arch:
770 if (strcmp (thawer.get_str (), "map"))
771 LOG (llevError, "%s: loading map and got a non 'arch map' line (arch %s), skipping.\n", &path, thawer.get_str ());
772 break;
773
774 case KW_oid:
775 thawer.get (this, thawer.get_sint32 ());
776 break;
777
778 case KW_file_format_version: break; // nop
779
780 case KW_name: thawer.get (name); break;
781 case KW_attach: thawer.get (attach); break;
782 case KW_reset_time: thawer.get (reset_time); break;
783 case KW_shopgreed: thawer.get (shopgreed); break;
784 case KW_shopmin: thawer.get (shopmin); break;
785 case KW_shopmax: thawer.get (shopmax); break;
786 case KW_shoprace: thawer.get (shoprace); break;
787 case KW_outdoor: thawer.get (outdoor); break;
788 case KW_temp: thawer.get (temp); break;
789 case KW_pressure: thawer.get (pressure); break;
790 case KW_humid: thawer.get (humid); break;
791 case KW_windspeed: thawer.get (windspeed); break;
792 case KW_winddir: thawer.get (winddir); break;
793 case KW_sky: thawer.get (sky); break;
794
795 case KW_per_player: thawer.get (per_player); break;
796 case KW_per_party: thawer.get (per_party); break;
797
798 case KW_region: get_region_by_name (thawer.get_str ()); break;
799 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
800
801 // old names new names
802 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
803 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
804 case KW_x: case KW_width: thawer.get (width); break;
805 case KW_y: case KW_height: thawer.get (height); break;
806 case KW_weight: case KW_reset_timeout: thawer.get (reset_timeout); break;
807 case KW_value: case KW_swap_time: thawer.get (timeout); break;
808 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
809 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
810 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
811
812 case KW_tile_path_1: thawer.get (tile_path [0]); break;
813 case KW_tile_path_2: thawer.get (tile_path [1]); break;
814 case KW_tile_path_3: thawer.get (tile_path [2]); break;
815 case KW_tile_path_4: thawer.get (tile_path [3]); break;
866 } 816 }
867 else
868 {
869 *value = 0;
870 value++;
871 end = strchr (value, '\n');
872
873 while (isspace (*value))
874 {
875 value++;
876
877 if (*value == '\0' || value == end)
878 {
879 /* Nothing but spaces. */
880 value = NULL;
881 break;
882 }
883 }
884 }
885
886 if (!end)
887 {
888 LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
889 return 1;
890 }
891
892 /* key is the field name, value is what it should be set
893 * to. We've already done the work to null terminate key,
894 * and strip off any leading spaces for both of these.
895 * We have not touched the newline at the end of the line -
896 * these are needed for some values. the end pointer
897 * points to the first of the newlines.
898 * value could be NULL! It would be easy enough to just point
899 * this to "" to prevent cores, but that would let more errors slide
900 * through.
901 *
902 * First check for entries that do not use the value parameter, then
903 * validate that value is given and check for the remaining entries
904 * that use the parameter.
905 */
906
907 if (!strcmp (key, "msg"))
908 {
909 while (fgets (buf, HUGE_BUF, fp) != NULL)
910 {
911 if (!strcmp (buf, "endmsg\n"))
912 break;
913 else
914 {
915 /* slightly more efficient than strcat */
916 strcpy (msgbuf + msgpos, buf);
917 msgpos += strlen (buf);
918 }
919 }
920 /* There are lots of maps that have empty messages (eg, msg/endmsg
921 * with nothing between). There is no reason in those cases to
922 * keep the empty message. Also, msgbuf contains garbage data
923 * when msgpos is zero, so copying it results in crashes
924 */
925 if (msgpos != 0)
926 m->msg = strdup (msgbuf);
927 }
928 else if (!strcmp (key, "maplore"))
929 {
930 while (fgets (buf, HUGE_BUF, fp) != NULL)
931 {
932 if (!strcmp (buf, "endmaplore\n"))
933 break;
934 else
935 {
936 /* slightly more efficient than strcat */
937 strcpy (maplorebuf + maplorepos, buf);
938 maplorepos += strlen (buf);
939 }
940 }
941 if (maplorepos != 0)
942 m->maplore = strdup (maplorebuf);
943 }
944 else if (!strcmp (key, "end"))
945 {
946 break;
947 }
948 else if (value == NULL)
949 {
950 LOG (llevError, "Got '%s' line without parameter in map header\n", key);
951 }
952 else if (!strcmp (key, "arch"))
953 {
954 /* This is an oddity, but not something we care about much. */
955 if (strcmp (value, "map\n"))
956 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
957 }
958 else if (!strcmp (key, "name"))
959 {
960 *end = 0;
961 m->name = strdup (value);
962 }
963 /* first strcmp value on these are old names supported
964 * for compatibility reasons. The new values (second) are
965 * what really should be used.
966 */
967 else if (!strcmp (key, "oid"))
968 fp.get (m, atoi (value));
969 else if (!strcmp (key, "attach"))
970 m->attach = value;
971 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
972 m->enter_x = atoi (value);
973 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
974 m->enter_y = atoi (value);
975 else if (!strcmp (key, "x") || !strcmp (key, "width"))
976 m->width = atoi (value);
977 else if (!strcmp (key, "y") || !strcmp (key, "height"))
978 m->height = atoi (value);
979 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
980 m->reset_timeout = atoi (value);
981 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
982 m->timeout = atoi (value);
983 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
984 m->difficulty = clamp (atoi (value), 1, settings.max_level);
985 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
986 m->darkness = atoi (value);
987 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
988 m->fixed_resettime = atoi (value);
989 else if (!strcmp (key, "unique"))
990 m->unique = atoi (value);
991 else if (!strcmp (key, "template"))
992 m->templatemap = atoi (value);
993 else if (!strcmp (key, "region"))
994 m->region = get_region_by_name (value);
995 else if (!strcmp (key, "shopitems"))
996 {
997 *end = 0;
998 m->shopitems = parse_shop_string (value);
999 }
1000 else if (!strcmp (key, "shopgreed"))
1001 m->shopgreed = atof (value);
1002 else if (!strcmp (key, "shopmin"))
1003 m->shopmin = atol (value);
1004 else if (!strcmp (key, "shopmax"))
1005 m->shopmax = atol (value);
1006 else if (!strcmp (key, "shoprace"))
1007 {
1008 *end = 0;
1009 m->shoprace = strdup (value);
1010 }
1011 else if (!strcmp (key, "outdoor"))
1012 m->outdoor = atoi (value);
1013 else if (!strcmp (key, "temp"))
1014 m->temp = atoi (value);
1015 else if (!strcmp (key, "pressure"))
1016 m->pressure = atoi (value);
1017 else if (!strcmp (key, "humid"))
1018 m->humid = atoi (value);
1019 else if (!strcmp (key, "windspeed"))
1020 m->windspeed = atoi (value);
1021 else if (!strcmp (key, "winddir"))
1022 m->winddir = atoi (value);
1023 else if (!strcmp (key, "sky"))
1024 m->sky = atoi (value);
1025 else if (!strcmp (key, "nosmooth"))
1026 m->nosmooth = atoi (value);
1027 else if (!strncmp (key, "tile_path_", 10))
1028 {
1029 int tile = atoi (key + 10);
1030
1031 if (tile < 1 || tile > 4)
1032 {
1033 LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
1034 }
1035 else
1036 {
1037 char *path;
1038
1039 *end = 0;
1040
1041 if (m->tile_path[tile - 1])
1042 {
1043 LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
1044 free (m->tile_path[tile - 1]);
1045 m->tile_path[tile - 1] = NULL;
1046 }
1047
1048 if (check_path (value, 1) != -1)
1049 {
1050 /* The unadorned path works. */
1051 path = value;
1052 }
1053 else
1054 {
1055 /* Try again; it could be a relative exit. */
1056
1057 path = path_combine_and_normalize (m->path, value);
1058
1059 if (check_path (path, 1) == -1)
1060 {
1061 LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
1062 path = NULL;
1063 }
1064 }
1065
1066 if (editor)
1067 {
1068 /* Use the value as in the file. */
1069 m->tile_path[tile - 1] = strdup (value);
1070 }
1071 else if (path != NULL)
1072 {
1073 /* Use the normalized value. */
1074 m->tile_path[tile - 1] = strdup (path);
1075 }
1076 } /* end if tile direction (in)valid */
1077 }
1078 else
1079 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1080 }
1081
1082 if (!key || strcmp (key, "end"))
1083 { 817 }
1084 LOG (llevError, "Got premature eof on map header!\n");
1085 return 1;
1086 }
1087 818
1088 return 0; 819 abort ();
1089} 820}
1090 821
1091/* 822bool
1092 * Opens the file "filename" and reads information about the map 823maptile::_load_header (const char *path)
1093 * from the given file, and stores it in a newly allocated
1094 * maptile. A pointer to this structure is returned, or NULL on failure.
1095 * flags correspond to those in map.h. Main ones used are
1096 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1097 * MAP_BLOCK, in which case we block on this load. This happens in all
1098 * cases, no matter if this flag is set or not.
1099 * MAP_STYLE: style map - don't add active objects, don't add to server
1100 * managed map list.
1101 */
1102
1103maptile *
1104load_original_map (const char *filename, int flags)
1105{ 824{
1106 maptile *m;
1107 char pathname[MAX_BUF];
1108
1109 if (flags & MAP_PLAYER_UNIQUE)
1110 strcpy (pathname, filename);
1111 else if (flags & MAP_OVERLAY)
1112 strcpy (pathname, create_overlay_pathname (filename));
1113 else
1114 strcpy (pathname, create_pathname (filename));
1115
1116 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1117
1118 object_thawer thawer (pathname); 825 object_thawer thawer (path);
1119 826
1120 if (!thawer) 827 if (!thawer)
1121 return 0; 828 return false;
1122 829
1123 m = get_linked_map (); 830 return _load_header (thawer);
1124
1125 strcpy (m->path, filename);
1126 if (load_map_header (thawer, m))
1127 {
1128 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1129 delete_map (m);
1130 return 0;
1131 }
1132
1133 m->allocate ();
1134
1135 m->in_memory = MAP_LOADING;
1136 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1137
1138 m->in_memory = MAP_IN_MEMORY;
1139 if (!m->difficulty)
1140 m->difficulty = calculate_difficulty (m);
1141 set_map_reset_time (m);
1142 m->instantiate ();
1143 return (m);
1144}
1145
1146/*
1147 * Loads a map, which has been loaded earlier, from file.
1148 * Return the map object we load into (this can change from the passed
1149 * option if we can't find the original map)
1150 */
1151
1152static maptile *
1153load_temporary_map (maptile *m)
1154{
1155 char buf[MAX_BUF];
1156
1157 if (!m->tmpname)
1158 {
1159 LOG (llevError, "No temporary filename for map %s\n", m->path);
1160 strcpy (buf, m->path);
1161 delete_map (m);
1162 m = load_original_map (buf, 0);
1163 if (m == NULL)
1164 return NULL;
1165 fix_auto_apply (m); /* Chests which open as default */
1166 return m;
1167 }
1168
1169 object_thawer thawer (m->tmpname);
1170
1171 if (!thawer)
1172 {
1173 strcpy (buf, m->path);
1174 delete_map (m);
1175 m = load_original_map (buf, 0);
1176 if (!m)
1177 return NULL;
1178 fix_auto_apply (m); /* Chests which open as default */
1179 return m;
1180 }
1181
1182 if (load_map_header (thawer, m))
1183 {
1184 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1185 delete_map (m);
1186 m = load_original_map (m->path, 0);
1187 return NULL;
1188 }
1189
1190 m->allocate ();
1191
1192 m->in_memory = MAP_LOADING;
1193 load_objects (m, thawer, 0);
1194
1195 m->in_memory = MAP_IN_MEMORY;
1196 INVOKE_MAP (SWAPIN, m);
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
1206maptile *
1207load_overlay_map (const char *filename, maptile *m)
1208{
1209 char pathname[MAX_BUF];
1210
1211 strcpy (pathname, create_overlay_pathname (filename));
1212
1213 object_thawer thawer (pathname);
1214
1215 if (!thawer)
1216 return m;
1217
1218 if (load_map_header (thawer, m))
1219 {
1220 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1221 delete_map (m);
1222 m = load_original_map (m->path, 0);
1223 return 0;
1224 }
1225 /*m->allocate ();*/
1226
1227 m->in_memory = MAP_LOADING;
1228 load_objects (m, thawer, MAP_OVERLAY);
1229
1230 m->in_memory = MAP_IN_MEMORY;
1231 return m;
1232} 831}
1233 832
1234/****************************************************************************** 833/******************************************************************************
1235 * This is the start of unique map handling code 834 * This is the start of unique map handling code
1236 *****************************************************************************/ 835 *****************************************************************************/
1237 836
1238/* This goes through map 'm' and removed any unique items on the map. */ 837/* This goes through the maptile and removed any unique items on the map. */
1239static void 838void
1240delete_unique_items (maptile *m) 839maptile::clear_unique_items ()
1241{ 840{
1242 int i, j, unique; 841 for (int i = 0; i < size (); ++i)
1243 object *op, *next;
1244
1245 for (i = 0; i < m->width; i++)
1246 for (j = 0; j < m->height; j++)
1247 { 842 {
1248 unique = 0; 843 int unique = 0;
1249 844 for (object *op = spaces [i].bot; op; )
1250 for (op = GET_MAP_OB (m, i, j); op; op = next)
1251 { 845 {
1252 next = op->above; 846 object *above = op->above;
1253 847
1254 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 848 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1255 unique = 1; 849 unique = 1;
1256 850
1257 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 851 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1258 { 852 {
1259 op->destroy_inv (false); 853 op->destroy_inv (false);
1260 op->destroy (); 854 op->destroy ();
1261 } 855 }
1262 }
1263 }
1264}
1265 856
1266 857 op = above;
1267/*
1268 * Loads unique objects from file(s) into the map which is in memory
1269 * m is the map to load unique items into.
1270 */
1271static void
1272load_unique_objects (maptile *m)
1273{
1274 int count;
1275 char firstname[MAX_BUF];
1276
1277 for (count = 0; count < 10; count++)
1278 {
1279 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1280 if (!access (firstname, R_OK))
1281 break;
1282 }
1283 /* If we get here, we did not find any map */
1284 if (count == 10)
1285 return;
1286
1287 object_thawer thawer (firstname);
1288
1289 if (!thawer)
1290 return;
1291
1292 m->in_memory = MAP_LOADING;
1293 if (m->tmpname == NULL) /* if we have loaded unique items from */
1294 delete_unique_items (m); /* original map before, don't duplicate them */
1295
1296 load_objects (m, thawer, 0);
1297
1298 m->in_memory = MAP_IN_MEMORY;
1299}
1300
1301/*
1302 * Saves a map to file. If flag is set, it is saved into the same
1303 * file it was (originally) loaded from. Otherwise a temporary
1304 * filename will be genarated, and the file will be stored there.
1305 * The temporary filename will be stored in the maptileure.
1306 * If the map is unique, we also save to the filename in the map
1307 * (this should have been updated when first loaded)
1308 */
1309int
1310new_save_map (maptile *m, int flag)
1311{
1312 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1313 int i;
1314
1315 if (flag && !*m->path)
1316 {
1317 LOG (llevError, "Tried to save map without path.\n");
1318 return -1;
1319 }
1320
1321 if (flag || (m->unique) || (m->templatemap))
1322 {
1323 if (!m->unique && !m->templatemap)
1324 { /* flag is set */
1325 if (flag == 2)
1326 strcpy (filename, create_overlay_pathname (m->path));
1327 else
1328 strcpy (filename, create_pathname (m->path));
1329 } 858 }
1330 else
1331 strcpy (filename, m->path);
1332
1333 make_path_to_file (filename);
1334 }
1335 else
1336 { 859 }
1337 if (!m->tmpname) 860}
1338 m->tmpname = tempnam (settings.tmpdir, NULL);
1339 861
1340 strcpy (filename, m->tmpname); 862bool
863maptile::_save_header (object_freezer &freezer)
864{
865#define MAP_OUT(k) freezer.put (KW_ ## k, k)
866#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
867
868 MAP_OUT2 (arch, "map");
869
870 if (name) MAP_OUT (name);
871 MAP_OUT (swap_time);
872 MAP_OUT (reset_time);
873 MAP_OUT (reset_timeout);
874 MAP_OUT (fixed_resettime);
875 MAP_OUT (difficulty);
876
877 if (region) MAP_OUT2 (region, region->name);
878
879 if (shopitems)
1341 } 880 {
881 char shop[MAX_BUF];
882 print_shop_string (this, shop);
883 MAP_OUT2 (shopitems, shop);
884 }
1342 885
1343 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 886 MAP_OUT (shopgreed);
1344 m->in_memory = MAP_SAVING; 887 MAP_OUT (shopmin);
888 MAP_OUT (shopmax);
889 if (shoprace) MAP_OUT (shoprace);
890 MAP_OUT (darkness);
891 MAP_OUT (width);
892 MAP_OUT (height);
893 MAP_OUT (enter_x);
894 MAP_OUT (enter_y);
1345 895
896 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
897 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
898
899 MAP_OUT (outdoor);
900 MAP_OUT (temp);
901 MAP_OUT (pressure);
902 MAP_OUT (humid);
903 MAP_OUT (windspeed);
904 MAP_OUT (winddir);
905 MAP_OUT (sky);
906
907 MAP_OUT (per_player);
908 MAP_OUT (per_party);
909
910 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
911 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
912 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
913 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
914
915 freezer.put (this);
916 freezer.put (KW_end);
917
918 return true;
919}
920
921bool
922maptile::_save_header (const char *path)
923{
1346 object_freezer freezer; 924 object_freezer freezer;
1347 925
1348 /* legacy */ 926 if (!_save_header (freezer))
1349 fprintf (freezer, "arch map\n"); 927 return false;
1350 if (m->name)
1351 fprintf (freezer, "name %s\n", m->name);
1352 if (!flag)
1353 fprintf (freezer, "swap_time %d\n", m->swap_time);
1354 if (m->reset_timeout)
1355 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1356 if (m->fixed_resettime)
1357 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1358 /* we unfortunately have no idea if this is a value the creator set
1359 * or a difficulty value we generated when the map was first loaded
1360 */
1361 if (m->difficulty)
1362 fprintf (freezer, "difficulty %d\n", m->difficulty);
1363 if (m->region)
1364 fprintf (freezer, "region %s\n", m->region->name);
1365 if (m->shopitems)
1366 {
1367 print_shop_string (m, shop);
1368 fprintf (freezer, "shopitems %s\n", shop);
1369 }
1370 if (m->shopgreed)
1371 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1372 if (m->shopmin)
1373 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1374 if (m->shopmax)
1375 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1376 if (m->shoprace)
1377 fprintf (freezer, "shoprace %s\n", m->shoprace);
1378 if (m->darkness)
1379 fprintf (freezer, "darkness %d\n", m->darkness);
1380 if (m->width)
1381 fprintf (freezer, "width %d\n", m->width);
1382 if (m->height)
1383 fprintf (freezer, "height %d\n", m->height);
1384 if (m->enter_x)
1385 fprintf (freezer, "enter_x %d\n", m->enter_x);
1386 if (m->enter_y)
1387 fprintf (freezer, "enter_y %d\n", m->enter_y);
1388 if (m->msg)
1389 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1390 if (m->maplore)
1391 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1392 if (m->unique)
1393 fprintf (freezer, "unique %d\n", m->unique);
1394 if (m->templatemap)
1395 fprintf (freezer, "template %d\n", m->templatemap);
1396 if (m->outdoor)
1397 fprintf (freezer, "outdoor %d\n", m->outdoor);
1398 if (m->temp)
1399 fprintf (freezer, "temp %d\n", m->temp);
1400 if (m->pressure)
1401 fprintf (freezer, "pressure %d\n", m->pressure);
1402 if (m->humid)
1403 fprintf (freezer, "humid %d\n", m->humid);
1404 if (m->windspeed)
1405 fprintf (freezer, "windspeed %d\n", m->windspeed);
1406 if (m->winddir)
1407 fprintf (freezer, "winddir %d\n", m->winddir);
1408 if (m->sky)
1409 fprintf (freezer, "sky %d\n", m->sky);
1410 if (m->nosmooth)
1411 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1412 928
1413 /* Save any tiling information, except on overlays */ 929 return freezer.save (path);
1414 if (flag != 2)
1415 for (i = 0; i < 4; i++)
1416 if (m->tile_path[i])
1417 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1418
1419 freezer.put (m);
1420 fprintf (freezer, "end\n");
1421
1422 /* In the game save unique items in the different file, but
1423 * in the editor save them to the normal map file.
1424 * If unique map, save files in the proper destination (set by
1425 * player)
1426 */
1427 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1428 {
1429 object_freezer unique;
1430
1431 if (flag == 2)
1432 save_objects (m, freezer, unique, 2);
1433 else
1434 save_objects (m, freezer, unique, 0);
1435
1436 sprintf (buf, "%s.v00", create_items_path (m->path));
1437
1438 unique.save (buf);
1439 }
1440 else
1441 { /* save same file when not playing, like in editor */
1442 save_objects (m, freezer, freezer, 0);
1443 }
1444
1445 freezer.save (filename);
1446
1447 return 0;
1448} 930}
1449 931
1450/* 932/*
1451 * Remove and free all objects in the given map. 933 * Remove and free all objects in the given map.
1452 */ 934 */
1453void 935void
1454free_all_objects (maptile *m) 936maptile::clear ()
1455{ 937{
1456 if (!m->spaces) 938 if (!spaces)
1457 return; 939 return;
1458 940
1459 for (int i = 0; i < m->width; i++) 941 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1460 for (int j = 0; j < m->height; j++) 942 while (object *op = ms->bot)
1461 { 943 {
1462 mapspace &ms = m->at (i, j);
1463
1464 while (object *op = ms.bot)
1465 {
1466 if (op->head) 944 if (op->head)
1467 op = op->head; 945 op = op->head;
1468 946
1469 op->destroy_inv (false); 947 op->destroy_inv (false);
1470 op->destroy (); 948 op->destroy ();
1471 }
1472 } 949 }
1473}
1474 950
1475/* 951 sfree (spaces, size ()), spaces = 0;
1476 * Frees everything allocated by the given maptileure. 952
1477 * don't free tmpname - our caller is left to do that 953 if (buttons)
1478 */ 954 free_objectlinkpt (buttons), buttons = 0;
955}
956
1479void 957void
1480free_map (maptile *m, int flag) 958maptile::clear_header ()
1481{ 959{
1482 if (!m->in_memory) //TODO: makes no sense to me? 960 name = 0;
1483 return; 961 msg = 0;
1484 962 maplore = 0;
1485 m->in_memory = MAP_SAVING; 963 shoprace = 0;
1486
1487 // TODO: use new/delete
1488
1489 if (flag && m->spaces)
1490 free_all_objects (m);
1491
1492 free (m->name), m->name = 0;
1493 free (m->spaces), m->spaces = 0;
1494 free (m->msg), m->msg = 0;
1495 free (m->maplore), m->maplore = 0;
1496 free (m->shoprace), m->shoprace = 0;
1497 delete [] m->shopitems, m->shopitems = 0; 964 delete [] shopitems, shopitems = 0;
1498
1499 if (m->buttons)
1500 free_objectlinkpt (m->buttons), m->buttons = 0;
1501 965
1502 for (int i = 0; i < 4; i++) 966 for (int i = 0; i < 4; i++)
1503 {
1504 if (m->tile_path[i])
1505 free (m->tile_path[i]), m->tile_path[i] = 0;
1506
1507 m->tile_map[i] = 0; 967 tile_path [i] = 0;
1508 }
1509
1510 m->in_memory = MAP_SWAPPED;
1511} 968}
1512 969
1513maptile::~maptile () 970maptile::~maptile ()
1514{ 971{
1515 free_map (this, 1); 972 assert (destroyed ());
1516 free (tmpname);
1517} 973}
1518 974
1519void 975void
1520maptile::do_destroy () 976maptile::clear_links_to (maptile *m)
1521{ 977{
1522 attachable::do_destroy ();
1523
1524 free_all_objects (this);
1525
1526 /* We need to look through all the maps and see if any maps 978 /* We need to look through all the maps and see if any maps
1527 * are pointing at this one for tiling information. Since 979 * are pointing at this one for tiling information. Since
1528 * tiling can be asymetric, we just can not look to see which 980 * tiling can be asymetric, we just can not look to see which
1529 * maps this map tiles with and clears those. 981 * maps this map tiles with and clears those.
1530 */ 982 */
1531 //TODO: non-euclidean-tiling MUST GO
1532 for (maptile *m = first_map; m; m = m->next)
1533 for (int i = 0; i < 4; i++) 983 for (int i = 0; i < 4; i++)
1534 if (m->tile_map[i] == this) 984 if (tile_map[i] == m)
1535 m->tile_map[i] = 0; 985 tile_map[i] = 0;
1536
1537 if (first_map == this)
1538 first_map = next;
1539 else
1540 for (maptile *m = first_map; m; m = m->next)
1541 if (m->next = this)
1542 {
1543 m->next = next;
1544 break;
1545 }
1546} 986}
1547 987
1548//TODO: must go
1549void 988void
1550delete_map (maptile *m) 989maptile::do_destroy ()
1551{ 990{
1552 if (m) 991 attachable::do_destroy ();
1553 m->destroy (); 992
993 clear ();
1554} 994}
1555 995
1556/* 996/*
1557 * Makes sure the given map is loaded and swapped in. 997 * Updates every button on the map (by calling update_button() for them).
1558 * name is path name of the map.
1559 * flags meaning:
1560 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1561 * and don't do unique items or the like.
1562 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1563 * dont do any more name translation on it.
1564 * 998 */
1565 * Returns a pointer to the given map. 999void
1566 */ 1000maptile::update_buttons ()
1567maptile *
1568ready_map_name (const char *name, int flags)
1569{ 1001{
1570 if (!name) 1002 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1571 return 0; 1003 for (objectlink *ol = obp->link; ol; ol = ol->next)
1572
1573 /* Have we been at this level before? */
1574 maptile *m = has_been_loaded (name);
1575
1576 /* Map is good to go, so just return it */
1577 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1578 return m;
1579
1580 /* unique maps always get loaded from their original location, and never
1581 * a temp location. Likewise, if map_flush is set, or we have never loaded
1582 * this map, load it now. I removed the reset checking from here -
1583 * it seems the probability of a player trying to enter a map that should
1584 * reset but hasn't yet is quite low, and removing that makes this function
1585 * a bit cleaner (and players probably shouldn't rely on exact timing for
1586 * resets in any case - if they really care, they should use the 'maps command.
1587 */
1588 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1589 { 1004 {
1590 /* first visit or time to reset */ 1005 if (!ol->ob)
1591 if (m)
1592 { 1006 {
1593 clean_tmp_map (m); /* Doesn't make much difference */ 1007 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1594 delete_map (m); 1008 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
1009 continue;
1595 } 1010 }
1596 1011
1597 /* create and load a map */ 1012 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1598 if (flags & MAP_PLAYER_UNIQUE)
1599 LOG (llevDebug, "Trying to load map %s.\n", name);
1600 else
1601 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1602
1603 //eval_pv ("$x = Event::time", 1);//D
1604 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1605 return (NULL);
1606 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1607
1608 fix_auto_apply (m); /* Chests which open as default */
1609
1610 /* If a player unique map, no extra unique object file to load.
1611 * if from the editor, likewise.
1612 */
1613 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1614 load_unique_objects (m);
1615
1616 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1617 { 1013 {
1618 m = load_overlay_map (name, m); 1014 update_button (ol->ob);
1619 if (m == NULL) 1015 break;
1620 return NULL;
1621 } 1016 }
1622
1623 if (flags & MAP_PLAYER_UNIQUE)
1624 INVOKE_MAP (SWAPIN, m);
1625
1626 } 1017 }
1627 else
1628 {
1629 /* If in this loop, we found a temporary map, so load it up. */
1630
1631 m = load_temporary_map (m);
1632 if (m == NULL)
1633 return NULL;
1634 load_unique_objects (m);
1635
1636 clean_tmp_map (m);
1637 m->in_memory = MAP_IN_MEMORY;
1638 /* tempnam() on sun systems (probably others) uses malloc
1639 * to allocated space for the string. Free it here.
1640 * In some cases, load_temporary_map above won't find the
1641 * temporary map, and so has reloaded a new map. If that
1642 * is the case, tmpname is now null
1643 */
1644 if (m->tmpname)
1645 free (m->tmpname);
1646 m->tmpname = NULL;
1647 /* It's going to be saved anew anyway */
1648 }
1649
1650 /* Below here is stuff common to both first time loaded maps and
1651 * temp maps.
1652 */
1653
1654 decay_objects (m); /* start the decay */
1655 /* In case other objects press some buttons down */
1656 update_buttons (m);
1657 if (m->outdoor)
1658 set_darkness_map (m);
1659 /* run the weather over this map */
1660 weather_effect (name);
1661 return m;
1662} 1018}
1663
1664 1019
1665/* 1020/*
1666 * This routine is supposed to find out the difficulty of the map. 1021 * This routine is supposed to find out the difficulty of the map.
1667 * difficulty does not have a lot to do with character level, 1022 * difficulty does not have a lot to do with character level,
1668 * but does have a lot to do with treasure on the map. 1023 * but does have a lot to do with treasure on the map.
1670 * Difficulty can now be set by the map creature. If the value stored 1025 * Difficulty can now be set by the map creature. If the value stored
1671 * in the map is zero, then use this routine. Maps should really 1026 * in the map is zero, then use this routine. Maps should really
1672 * have a difficulty set than using this function - human calculation 1027 * have a difficulty set than using this function - human calculation
1673 * is much better than this functions guesswork. 1028 * is much better than this functions guesswork.
1674 */ 1029 */
1675
1676int 1030int
1677calculate_difficulty (maptile *m) 1031maptile::estimate_difficulty () const
1678{ 1032{
1679 object *op;
1680 archetype *at;
1681 int x, y, i;
1682 long monster_cnt = 0; 1033 long monster_cnt = 0;
1683 double avgexp = 0; 1034 double avgexp = 0;
1684 sint64 total_exp = 0; 1035 sint64 total_exp = 0;
1685 1036
1686 if (m->difficulty) 1037 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1687 { 1038 for (object *op = ms->bot; op; op = op->above)
1688 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1689 return m->difficulty;
1690 }
1691
1692 for (x = 0; x < m->width; x++)
1693 for (y = 0; y < m->height; y++)
1694 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1695 { 1039 {
1696 if (QUERY_FLAG (op, FLAG_MONSTER)) 1040 if (QUERY_FLAG (op, FLAG_MONSTER))
1697 { 1041 {
1698 total_exp += op->stats.exp; 1042 total_exp += op->stats.exp;
1699 monster_cnt++; 1043 monster_cnt++;
1700 } 1044 }
1701 1045
1702 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1046 if (QUERY_FLAG (op, FLAG_GENERATOR))
1703 { 1047 {
1704 total_exp += op->stats.exp; 1048 total_exp += op->stats.exp;
1049
1705 at = type_to_archetype (GENERATE_TYPE (op)); 1050 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1706
1707 if (at != NULL)
1708 total_exp += at->clone.stats.exp * 8; 1051 total_exp += at->clone.stats.exp * 8;
1709 1052
1710 monster_cnt++; 1053 monster_cnt++;
1711 } 1054 }
1712 } 1055 }
1713 1056
1714 avgexp = (double) total_exp / monster_cnt; 1057 avgexp = (double) total_exp / monster_cnt;
1715 1058
1716 for (i = 1; i <= settings.max_level; i++) 1059 for (int i = 1; i <= settings.max_level; i++)
1717 {
1718 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp)) 1060 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp))
1719 {
1720 /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1721 return i; 1061 return i;
1722 }
1723 }
1724 1062
1725 return 1; 1063 return 1;
1726}
1727
1728void
1729clean_tmp_map (maptile *m)
1730{
1731 if (m->tmpname == NULL)
1732 return;
1733 INVOKE_MAP (CLEAN, m);
1734 (void) unlink (m->tmpname);
1735}
1736
1737void
1738free_all_maps (void)
1739{
1740 int real_maps = 0;
1741
1742 while (first_map)
1743 {
1744 /* I think some of the callers above before it gets here set this to be
1745 * saving, but we still want to free this data
1746 */
1747 if (first_map->in_memory == MAP_SAVING)
1748 first_map->in_memory = MAP_IN_MEMORY;
1749 delete_map (first_map);
1750 real_maps++;
1751 }
1752 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1753} 1064}
1754 1065
1755/* change_map_light() - used to change map light level (darkness) 1066/* change_map_light() - used to change map light level (darkness)
1756 * up or down. Returns true if successful. It should now be 1067 * up or down. Returns true if successful. It should now be
1757 * possible to change a value by more than 1. 1068 * possible to change a value by more than 1.
1758 * Move this from los.c to map.c since this is more related 1069 * Move this from los.c to map.c since this is more related
1759 * to maps than los. 1070 * to maps than los.
1760 * postive values make it darker, negative make it brighter 1071 * postive values make it darker, negative make it brighter
1761 */ 1072 */
1762
1763int 1073int
1764change_map_light (maptile *m, int change) 1074maptile::change_map_light (int change)
1765{ 1075{
1766 int new_level = m->darkness + change; 1076 int new_level = darkness + change;
1767 1077
1768 /* Nothing to do */ 1078 /* Nothing to do */
1769 if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS)) 1079 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))
1770 {
1771 return 0; 1080 return 0;
1772 }
1773 1081
1774 /* inform all players on the map */ 1082 /* inform all players on the map */
1775 if (change > 0) 1083 if (change > 0)
1776 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); 1084 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1777 else 1085 else
1778 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); 1086 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1779 1087
1780 /* Do extra checking. since m->darkness is a unsigned value, 1088 /* Do extra checking. since darkness is a unsigned value,
1781 * we need to be extra careful about negative values. 1089 * we need to be extra careful about negative values.
1782 * In general, the checks below are only needed if change 1090 * In general, the checks below are only needed if change
1783 * is not +/-1 1091 * is not +/-1
1784 */ 1092 */
1785 if (new_level < 0) 1093 if (new_level < 0)
1786 m->darkness = 0; 1094 darkness = 0;
1787 else if (new_level >= MAX_DARKNESS) 1095 else if (new_level >= MAX_DARKNESS)
1788 m->darkness = MAX_DARKNESS; 1096 darkness = MAX_DARKNESS;
1789 else 1097 else
1790 m->darkness = new_level; 1098 darkness = new_level;
1791 1099
1792 /* All clients need to get re-updated for the change */ 1100 /* All clients need to get re-updated for the change */
1793 update_all_map_los (m); 1101 update_all_map_los (this);
1794 return 1; 1102 return 1;
1795} 1103}
1796 1104
1797/* 1105/*
1798 * This function updates various attributes about a specific space 1106 * This function updates various attributes about a specific space
1929 1237
1930 /* If two top faces are already set, quit processing */ 1238 /* If two top faces are already set, quit processing */
1931 if ((top != blank_face) && (middle != blank_face)) 1239 if ((top != blank_face) && (middle != blank_face))
1932 break; 1240 break;
1933 1241
1934 /* Only show visible faces, unless its the editor - show all */ 1242 /* Only show visible faces */
1935 if (!tmp->invisible || editor) 1243 if (!tmp->invisible)
1936 { 1244 {
1937 /* Fill in top if needed */ 1245 /* Fill in top if needed */
1938 if (top == blank_face) 1246 if (top == blank_face)
1939 { 1247 {
1940 top = tmp->face; 1248 top = tmp->face;
1970 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1278 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1971 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1279 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1972 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1280 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1973} 1281}
1974 1282
1975void
1976set_map_reset_time (maptile *map)
1977{
1978 int timeout;
1979
1980 timeout = map->reset_timeout;
1981 if (timeout <= 0)
1982 timeout = MAP_DEFAULTRESET;
1983 if (timeout >= MAP_MAXRESET)
1984 timeout = MAP_MAXRESET;
1985 map->reset_time = time (0) + timeout;
1986}
1987
1988/* this updates the orig_map->tile_map[tile_num] value after loading 1283/* this updates the orig_map->tile_map[tile_num] value after finding
1989 * the map. It also takes care of linking back the freshly loaded 1284 * the map. It also takes care of linking back the freshly found
1990 * maps tile_map values if it tiles back to this one. It returns 1285 * maps tile_map values if it tiles back to this one. It returns
1991 * the value of orig_map->tile_map[tile_num]. It really only does this 1286 * the value of orig_map->tile_map[tile_num].
1992 * so that it is easier for calling functions to verify success.
1993 */ 1287 */
1994
1995static maptile * 1288static inline maptile *
1996load_and_link_tiled_map (maptile *orig_map, int tile_num) 1289find_and_link (maptile *orig_map, int tile_num)
1997{ 1290{
1291 maptile *mp = orig_map->tile_map [tile_num];
1292
1293 if (!mp)
1294 {
1295 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1296
1297 if (!mp)
1298 {
1299 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1300 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1301 &orig_map->tile_path[tile_num], &orig_map->path);
1302 mp = new maptile (1, 1);
1303 mp->alloc ();
1304 mp->in_memory = MAP_IN_MEMORY;
1305 }
1306 }
1307
1998 int dest_tile = (tile_num + 2) % 4; 1308 int dest_tile = (tile_num + 2) % 4;
1999 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
2000 1309
2001 orig_map->tile_map[tile_num] = ready_map_name (path, 0); 1310 orig_map->tile_map [tile_num] = mp;
2002 1311
2003 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1312 // optimisation: back-link map to origin map if euclidean
2004 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)) 1313 //TODO: non-euclidean maps MUST GO
1314 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
2005 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1315 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
2006 1316
2007 return orig_map->tile_map[tile_num]; 1317 return mp;
1318}
1319
1320static inline void
1321load_and_link (maptile *orig_map, int tile_num)
1322{
1323 find_and_link (orig_map, tile_num)->load_sync ();
2008} 1324}
2009 1325
2010/* this returns TRUE if the coordinates (x,y) are out of 1326/* this returns TRUE if the coordinates (x,y) are out of
2011 * map m. This function also takes into account any 1327 * map m. This function also takes into account any
2012 * tiling considerations, loading adjacant maps as needed. 1328 * tiling considerations, loading adjacant maps as needed.
2013 * This is the function should always be used when it 1329 * This is the function should always be used when it
2014 * necessary to check for valid coordinates. 1330 * necessary to check for valid coordinates.
2015 * This function will recursively call itself for the 1331 * This function will recursively call itself for the
2016 * tiled maps. 1332 * tiled maps.
2017 *
2018 *
2019 */ 1333 */
2020int 1334int
2021out_of_map (maptile *m, int x, int y) 1335out_of_map (maptile *m, int x, int y)
2022{ 1336{
2023 /* If we get passed a null map, this is obviously the 1337 /* If we get passed a null map, this is obviously the
2031 { 1345 {
2032 if (!m->tile_path[3]) 1346 if (!m->tile_path[3])
2033 return 1; 1347 return 1;
2034 1348
2035 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1349 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2036 load_and_link_tiled_map (m, 3); 1350 find_and_link (m, 3);
2037 1351
2038 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y)); 1352 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
2039 } 1353 }
2040 1354
2041 if (x >= m->width) 1355 if (x >= m->width)
2042 { 1356 {
2043 if (!m->tile_path[1]) 1357 if (!m->tile_path[1])
2044 return 1; 1358 return 1;
2045 1359
2046 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1360 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2047 load_and_link_tiled_map (m, 1); 1361 find_and_link (m, 1);
2048 1362
2049 return (out_of_map (m->tile_map[1], x - m->width, y)); 1363 return out_of_map (m->tile_map[1], x - m->width, y);
2050 } 1364 }
2051 1365
2052 if (y < 0) 1366 if (y < 0)
2053 { 1367 {
2054 if (!m->tile_path[0]) 1368 if (!m->tile_path[0])
2055 return 1; 1369 return 1;
2056 1370
2057 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1371 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2058 load_and_link_tiled_map (m, 0); 1372 find_and_link (m, 0);
2059 1373
2060 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height)); 1374 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
2061 } 1375 }
2062 1376
2063 if (y >= m->height) 1377 if (y >= m->height)
2064 { 1378 {
2065 if (!m->tile_path[2]) 1379 if (!m->tile_path[2])
2066 return 1; 1380 return 1;
2067 1381
2068 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1382 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2069 load_and_link_tiled_map (m, 2); 1383 find_and_link (m, 2);
2070 1384
2071 return (out_of_map (m->tile_map[2], x, y - m->height)); 1385 return out_of_map (m->tile_map[2], x, y - m->height);
2072 } 1386 }
2073 1387
2074 /* Simple case - coordinates are within this local 1388 /* Simple case - coordinates are within this local
2075 * map. 1389 * map.
2076 */ 1390 */
2079 1393
2080/* This is basically the same as out_of_map above, but 1394/* This is basically the same as out_of_map above, but
2081 * instead we return NULL if no map is valid (coordinates 1395 * instead we return NULL if no map is valid (coordinates
2082 * out of bounds and no tiled map), otherwise it returns 1396 * out of bounds and no tiled map), otherwise it returns
2083 * the map as that the coordinates are really on, and 1397 * the map as that the coordinates are really on, and
2084 * updates x and y to be the localized coordinates. 1398 * updates x and y to be the localised coordinates.
2085 * Using this is more efficient of calling out_of_map 1399 * Using this is more efficient of calling out_of_map
2086 * and then figuring out what the real map is 1400 * and then figuring out what the real map is
2087 */ 1401 */
2088maptile * 1402maptile *
2089get_map_from_coord (maptile *m, sint16 * x, sint16 * y) 1403maptile::xy_find (sint16 &x, sint16 &y)
2090{ 1404{
2091
2092 if (*x < 0) 1405 if (x < 0)
2093 { 1406 {
2094 if (!m->tile_path[3]) 1407 if (!tile_path[3])
2095 return 0; 1408 return 0;
2096 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2097 load_and_link_tiled_map (m, 3);
2098 1409
1410 find_and_link (this, 3);
2099 *x += m->tile_map[3]->width; 1411 x += tile_map[3]->width;
2100 return (get_map_from_coord (m->tile_map[3], x, y)); 1412 return tile_map[3]->xy_find (x, y);
2101 } 1413 }
2102 1414
2103 if (*x >= m->width) 1415 if (x >= width)
2104 { 1416 {
2105 if (!m->tile_path[1]) 1417 if (!tile_path[1])
2106 return 0; 1418 return 0;
2107 1419
2108 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1420 find_and_link (this, 1);
2109 load_and_link_tiled_map (m, 1);
2110
2111 *x -= m->width; 1421 x -= width;
2112 return (get_map_from_coord (m->tile_map[1], x, y)); 1422 return tile_map[1]->xy_find (x, y);
2113 } 1423 }
2114 1424
2115 if (*y < 0) 1425 if (y < 0)
2116 { 1426 {
2117 if (!m->tile_path[0]) 1427 if (!tile_path[0])
2118 return 0; 1428 return 0;
2119 1429
2120 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1430 find_and_link (this, 0);
2121 load_and_link_tiled_map (m, 0);
2122
2123 *y += m->tile_map[0]->height; 1431 y += tile_map[0]->height;
2124 return (get_map_from_coord (m->tile_map[0], x, y)); 1432 return tile_map[0]->xy_find (x, y);
2125 } 1433 }
2126 1434
2127 if (*y >= m->height) 1435 if (y >= height)
2128 { 1436 {
2129 if (!m->tile_path[2]) 1437 if (!tile_path[2])
2130 return 0; 1438 return 0;
2131 1439
2132 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1440 find_and_link (this, 2);
2133 load_and_link_tiled_map (m, 2);
2134
2135 *y -= m->height; 1441 y -= height;
2136 return (get_map_from_coord (m->tile_map[2], x, y)); 1442 return tile_map[2]->xy_find (x, y);
2137 } 1443 }
2138 1444
2139 /* Simple case - coordinates are within this local 1445 /* Simple case - coordinates are within this local
2140 * map. 1446 * map.
2141 */ 1447 */
2142
2143 return m; 1448 return this;
2144} 1449}
2145 1450
2146/** 1451/**
2147 * Return whether map2 is adjacent to map1. If so, store the distance from 1452 * Return whether map2 is adjacent to map1. If so, store the distance from
2148 * map1 to map2 in dx/dy. 1453 * map1 to map2 in dx/dy.
2151adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
2152{ 1457{
2153 if (!map1 || !map2) 1458 if (!map1 || !map2)
2154 return 0; 1459 return 0;
2155 1460
1461 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1462 //fix: compare paths instead (this is likely faster, too!)
2156 if (map1 == map2) 1463 if (map1 == map2)
2157 { 1464 {
2158 *dx = 0; 1465 *dx = 0;
2159 *dy = 0; 1466 *dy = 0;
2160
2161 } 1467 }
2162 else if (map1->tile_map[0] == map2) 1468 else if (map1->tile_map[0] == map2)
2163 { /* up */ 1469 { /* up */
2164 *dx = 0; 1470 *dx = 0;
2165 *dy = -map2->height; 1471 *dy = -map2->height;
2176 } 1482 }
2177 else if (map1->tile_map[3] == map2) 1483 else if (map1->tile_map[3] == map2)
2178 { /* left */ 1484 { /* left */
2179 *dx = -map2->width; 1485 *dx = -map2->width;
2180 *dy = 0; 1486 *dy = 0;
2181
2182 } 1487 }
2183 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1488 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2184 { /* up right */ 1489 { /* up right */
2185 *dx = map1->tile_map[0]->width; 1490 *dx = map1->tile_map[0]->width;
2186 *dy = -map1->tile_map[0]->height; 1491 *dy = -map1->tile_map[0]->height;
2217 } 1522 }
2218 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1523 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2219 { /* left down */ 1524 { /* left down */
2220 *dx = -map1->tile_map[3]->width; 1525 *dx = -map1->tile_map[3]->width;
2221 *dy = map1->tile_map[3]->height; 1526 *dy = map1->tile_map[3]->height;
2222
2223 } 1527 }
2224 else 1528 else
2225 { /* not "adjacent" enough */
2226 return 0; 1529 return 0;
2227 }
2228 1530
2229 return 1; 1531 return 1;
1532}
1533
1534maptile *
1535maptile::xy_load (sint16 &x, sint16 &y)
1536{
1537 maptile *map = xy_find (x, y);
1538
1539 if (map)
1540 map->load_sync ();
1541
1542 return map;
1543}
1544
1545maptile *
1546get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1547{
1548 return m->xy_load (*x, *y);
2230} 1549}
2231 1550
2232/* From map.c 1551/* From map.c
2233 * This is used by get_player to determine where the other 1552 * This is used by get_player to determine where the other
2234 * creature is. get_rangevector takes into account map tiling, 1553 * creature is. get_rangevector takes into account map tiling,
2247 * be unexpected 1566 * be unexpected
2248 * 1567 *
2249 * currently, the only flag supported (0x1) is don't translate for 1568 * currently, the only flag supported (0x1) is don't translate for
2250 * closest body part of 'op1' 1569 * closest body part of 'op1'
2251 */ 1570 */
2252
2253void 1571void
2254get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1572get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2255{ 1573{
2256 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1574 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2257 { 1575 {
2338 } 1656 }
2339} 1657}
2340 1658
2341/* Returns true of op1 and op2 are effectively on the same map 1659/* Returns true of op1 and op2 are effectively on the same map
2342 * (as related to map tiling). Note that this looks for a path from 1660 * (as related to map tiling). Note that this looks for a path from
2343 * op1 to op2, so if the tiled maps are assymetric and op2 has a path 1661 * op1 to op2, so if the tiled maps are asymetric and op2 has a path
2344 * to op1, this will still return false. 1662 * to op1, this will still return false.
2345 * Note we only look one map out to keep the processing simple 1663 * Note we only look one map out to keep the processing simple
2346 * and efficient. This could probably be a macro. 1664 * and efficient. This could probably be a macro.
2347 * MSW 2001-08-05 1665 * MSW 2001-08-05
2348 */ 1666 */
2351{ 1669{
2352 int dx, dy; 1670 int dx, dy;
2353 1671
2354 return adjacent_map (op1->map, op2->map, &dx, &dy); 1672 return adjacent_map (op1->map, op2->map, &dx, &dy);
2355} 1673}
1674
1675object *
1676maptile::insert (object *op, int x, int y, object *originator, int flags)
1677{
1678 if (!op->flag [FLAG_REMOVED])
1679 op->remove ();
1680
1681 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1682}
1683

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines