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.50 by root, Mon Dec 25 15:28:35 2006 UTC vs.
Revision 1.75 by root, Mon Jan 15 01:25:41 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 for (op = m->at (i, j).bot; op; op = op->above) 453 /* check for unique items, or unique squares */
454 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
617 { 455 {
618 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE]) 456 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
619 unique = 1; 457 unique = 1;
620 458
621 if (op->type == PLAYER) 459 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
622 continue; 460 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
623
624 if (op->head || op->owner)
625 continue;
626
627 if (unique || op->flag [FLAG_UNIQUE])
628 save_object (fp2, op, 3);
629 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
630 save_object (fp, op, 3);
631 } 461 }
632 } 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);
633} 567}
634 568
635maptile::maptile () 569maptile::maptile ()
636{ 570{
637 in_memory = MAP_SWAPPED; 571 in_memory = MAP_SWAPPED;
572
638 /* 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
639 * map archetype. Mimic that behaviour. 574 * map archetype. Mimic that behaviour.
640 */ 575 */
641 this->width = 16; 576 width = 16;
642 this->height = 16; 577 height = 16;
643 this->reset_timeout = 0; 578 reset_timeout = 0;
644 this->timeout = 300; 579 timeout = 300;
645 this->enter_x = 0; 580 enter_x = 0;
646 this->enter_y = 0; 581 enter_y = 0;
647 /*set part to -1 indicating conversion to weather map not yet done */
648 this->worldpartx = -1;
649 this->worldparty = -1;
650} 582}
651 583
652/* 584maptile::maptile (int w, int h)
653 * Allocates, initialises, and returns a pointer to a maptile.
654 * Modified to no longer take a path option which was not being
655 * used anyways. MSW 2001-07-01
656 */
657maptile *
658get_linked_map (void)
659{ 585{
660 maptile *mp, *map = new maptile; 586 in_memory = MAP_SWAPPED;
661 587
662 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;
663 594
664 if (mp == NULL) 595 alloc ();
665 first_map = map;
666 else
667 mp->next = map;
668
669 return map;
670} 596}
671 597
672/* 598/*
673 * Allocates the arrays contained in a maptile. 599 * Allocates the arrays contained in a maptile.
674 * This basically allocates the dynamic array of spaces for the 600 * This basically allocates the dynamic array of spaces for the
675 * map. 601 * map.
676 */ 602 */
677void 603void
678maptile::allocate () 604maptile::alloc ()
679{ 605{
680 in_memory = MAP_IN_MEMORY;
681
682 /* Log this condition and free the storage. We could I suppose
683 * realloc, but if the caller is presuming the data will be intact,
684 * that is their poor assumption.
685 */
686 if (spaces) 606 if (spaces)
687 {
688 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
689 free (spaces);
690 }
691
692 spaces = (mapspace *)
693 calloc (1, width * height * sizeof (mapspace));
694
695 if (!spaces)
696 fatal (OUT_OF_MEMORY);
697}
698
699/* Create and returns a map of the specific size. Used
700 * in random map code and the editor.
701 */
702maptile *
703get_empty_map (int sizex, int sizey)
704{
705 maptile *m = get_linked_map ();
706
707 m->width = sizex;
708 m->height = sizey;
709 m->in_memory = MAP_SWAPPED;
710 m->allocate ();
711
712 return m; 607 return;
608
609 spaces = salloc0<mapspace> (size ());
713} 610}
714 611
715/* 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
716 * 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
717 * at a later date. 614 * at a later date.
718 * Called by parse_map_headers below. 615 * Called by parse_map_headers below.
719 */ 616 */
720
721static shopitems * 617static shopitems *
722parse_shop_string (const char *input_string) 618parse_shop_string (const char *input_string)
723{ 619{
724 char *shop_string, *p, *q, *next_semicolon, *next_colon; 620 char *shop_string, *p, *q, *next_semicolon, *next_colon;
725 shopitems *items = NULL; 621 shopitems *items = NULL;
734 p = strchr (p, ';'); 630 p = strchr (p, ';');
735 number_of_entries++; 631 number_of_entries++;
736 if (p) 632 if (p)
737 p++; 633 p++;
738 } 634 }
635
739 p = shop_string; 636 p = shop_string;
740 strip_endline (p); 637 strip_endline (p);
741 items = new shopitems[number_of_entries + 1]; 638 items = new shopitems[number_of_entries + 1];
742 for (i = 0; i < number_of_entries; i++) 639 for (i = 0; i < number_of_entries; i++)
743 { 640 {
744 if (!p) 641 if (!p)
745 { 642 {
746 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");
747 break; 644 break;
748 } 645 }
646
749 next_semicolon = strchr (p, ';'); 647 next_semicolon = strchr (p, ';');
750 next_colon = strchr (p, ':'); 648 next_colon = strchr (p, ':');
751 /* 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. */
752 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 650 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
753 items[i].strength = atoi (strchr (p, ':') + 1); 651 items[i].strength = atoi (strchr (p, ':') + 1);
780 * 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
781 */ 679 */
782 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);
783 } 681 }
784 } 682 }
683
785 items[i].index = number_of_entries; 684 items[i].index = number_of_entries;
786 if (next_semicolon) 685 if (next_semicolon)
787 p = ++next_semicolon; 686 p = ++next_semicolon;
788 else 687 else
789 p = NULL; 688 p = NULL;
790 } 689 }
690
791 free (shop_string); 691 free (shop_string);
792 return items; 692 return items;
793} 693}
794 694
795/* 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
804 for (i = 0; i < m->shopitems[0].index; i++) 704 for (i = 0; i < m->shopitems[0].index; i++)
805 { 705 {
806 if (m->shopitems[i].typenum) 706 if (m->shopitems[i].typenum)
807 { 707 {
808 if (m->shopitems[i].strength) 708 if (m->shopitems[i].strength)
809 {
810 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);
811 }
812 else 710 else
813 sprintf (tmp, "%s;", m->shopitems[i].name); 711 sprintf (tmp, "%s;", m->shopitems[i].name);
814 } 712 }
815 else 713 else
816 { 714 {
817 if (m->shopitems[i].strength) 715 if (m->shopitems[i].strength)
818 {
819 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 716 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
820 }
821 else 717 else
822 sprintf (tmp, "*"); 718 sprintf (tmp, "*");
823 } 719 }
720
824 strcat (output_string, tmp); 721 strcat (output_string, tmp);
825 } 722 }
826} 723}
827 724
828/* This loads the header information of the map. The header 725/* This loads the header information of the map. The header
833 * 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
834 * sense. 731 * sense.
835 * 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
836 * 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.
837 * MSW 2001-07-01 734 * MSW 2001-07-01
838 * return 0 on success, 1 on failure.
839 */ 735 */
840 736bool
841static int 737maptile::_load_header (object_thawer &thawer)
842load_map_header (object_thawer & fp, maptile *m)
843{ 738{
844 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; 739 for (;;)
845 int msgpos = 0;
846 int maplorepos = 0;
847
848 while (fgets (buf, HUGE_BUF, fp) != NULL)
849 { 740 {
850 buf[HUGE_BUF - 1] = 0; 741 keyword kw = thawer.get_kv ();
851 key = buf;
852 742
853 while (isspace (*key)) 743 switch (kw)
854 key++;
855
856 if (*key == 0)
857 continue; /* empty line */
858
859 value = strchr (key, ' ');
860
861 if (!value)
862 { 744 {
863 if ((end = strchr (key, '\n'))) 745 case KW_EOF:
864 *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;
865 } 816 }
866 else
867 {
868 *value = 0;
869 value++;
870 end = strchr (value, '\n');
871
872 while (isspace (*value))
873 {
874 value++;
875
876 if (*value == '\0' || value == end)
877 {
878 /* Nothing but spaces. */
879 value = NULL;
880 break;
881 }
882 }
883 }
884
885 if (!end)
886 {
887 LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
888 return 1;
889 }
890
891 /* key is the field name, value is what it should be set
892 * to. We've already done the work to null terminate key,
893 * and strip off any leading spaces for both of these.
894 * We have not touched the newline at the end of the line -
895 * these are needed for some values. the end pointer
896 * points to the first of the newlines.
897 * value could be NULL! It would be easy enough to just point
898 * this to "" to prevent cores, but that would let more errors slide
899 * through.
900 *
901 * First check for entries that do not use the value parameter, then
902 * validate that value is given and check for the remaining entries
903 * that use the parameter.
904 */
905
906 if (!strcmp (key, "msg"))
907 {
908 while (fgets (buf, HUGE_BUF, fp) != NULL)
909 {
910 if (!strcmp (buf, "endmsg\n"))
911 break;
912 else
913 {
914 /* slightly more efficient than strcat */
915 strcpy (msgbuf + msgpos, buf);
916 msgpos += strlen (buf);
917 }
918 }
919 /* There are lots of maps that have empty messages (eg, msg/endmsg
920 * with nothing between). There is no reason in those cases to
921 * keep the empty message. Also, msgbuf contains garbage data
922 * when msgpos is zero, so copying it results in crashes
923 */
924 if (msgpos != 0)
925 m->msg = strdup (msgbuf);
926 }
927 else if (!strcmp (key, "maplore"))
928 {
929 while (fgets (buf, HUGE_BUF, fp) != NULL)
930 {
931 if (!strcmp (buf, "endmaplore\n"))
932 break;
933 else
934 {
935 /* slightly more efficient than strcat */
936 strcpy (maplorebuf + maplorepos, buf);
937 maplorepos += strlen (buf);
938 }
939 }
940 if (maplorepos != 0)
941 m->maplore = strdup (maplorebuf);
942 }
943 else if (!strcmp (key, "end"))
944 {
945 break;
946 }
947 else if (value == NULL)
948 {
949 LOG (llevError, "Got '%s' line without parameter in map header\n", key);
950 }
951 else if (!strcmp (key, "arch"))
952 {
953 /* This is an oddity, but not something we care about much. */
954 if (strcmp (value, "map\n"))
955 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
956 }
957 else if (!strcmp (key, "name"))
958 {
959 *end = 0;
960 m->name = strdup (value);
961 }
962 /* first strcmp value on these are old names supported
963 * for compatibility reasons. The new values (second) are
964 * what really should be used.
965 */
966 else if (!strcmp (key, "oid"))
967 fp.get (m, atoi (value));
968 else if (!strcmp (key, "attach"))
969 m->attach = value;
970 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
971 m->enter_x = atoi (value);
972 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
973 m->enter_y = atoi (value);
974 else if (!strcmp (key, "x") || !strcmp (key, "width"))
975 m->width = atoi (value);
976 else if (!strcmp (key, "y") || !strcmp (key, "height"))
977 m->height = atoi (value);
978 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
979 m->reset_timeout = atoi (value);
980 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
981 m->timeout = atoi (value);
982 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
983 m->difficulty = clamp (atoi (value), 1, settings.max_level);
984 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
985 m->darkness = atoi (value);
986 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
987 m->fixed_resettime = atoi (value);
988 else if (!strcmp (key, "unique"))
989 m->unique = atoi (value);
990 else if (!strcmp (key, "template"))
991 m->templatemap = atoi (value);
992 else if (!strcmp (key, "region"))
993 m->region = get_region_by_name (value);
994 else if (!strcmp (key, "shopitems"))
995 {
996 *end = 0;
997 m->shopitems = parse_shop_string (value);
998 }
999 else if (!strcmp (key, "shopgreed"))
1000 m->shopgreed = atof (value);
1001 else if (!strcmp (key, "shopmin"))
1002 m->shopmin = atol (value);
1003 else if (!strcmp (key, "shopmax"))
1004 m->shopmax = atol (value);
1005 else if (!strcmp (key, "shoprace"))
1006 {
1007 *end = 0;
1008 m->shoprace = strdup (value);
1009 }
1010 else if (!strcmp (key, "outdoor"))
1011 m->outdoor = atoi (value);
1012 else if (!strcmp (key, "temp"))
1013 m->temp = atoi (value);
1014 else if (!strcmp (key, "pressure"))
1015 m->pressure = atoi (value);
1016 else if (!strcmp (key, "humid"))
1017 m->humid = atoi (value);
1018 else if (!strcmp (key, "windspeed"))
1019 m->windspeed = atoi (value);
1020 else if (!strcmp (key, "winddir"))
1021 m->winddir = atoi (value);
1022 else if (!strcmp (key, "sky"))
1023 m->sky = atoi (value);
1024 else if (!strcmp (key, "nosmooth"))
1025 m->nosmooth = atoi (value);
1026 else if (!strncmp (key, "tile_path_", 10))
1027 {
1028 int tile = atoi (key + 10);
1029
1030 if (tile < 1 || tile > 4)
1031 {
1032 LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
1033 }
1034 else
1035 {
1036 char *path;
1037
1038 *end = 0;
1039
1040 if (m->tile_path[tile - 1])
1041 {
1042 LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
1043 free (m->tile_path[tile - 1]);
1044 m->tile_path[tile - 1] = NULL;
1045 }
1046
1047 if (check_path (value, 1) != -1)
1048 {
1049 /* The unadorned path works. */
1050 path = value;
1051 }
1052 else
1053 {
1054 /* Try again; it could be a relative exit. */
1055
1056 path = path_combine_and_normalize (m->path, value);
1057
1058 if (check_path (path, 1) == -1)
1059 {
1060 LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
1061 path = NULL;
1062 }
1063 }
1064
1065 if (editor)
1066 {
1067 /* Use the value as in the file. */
1068 m->tile_path[tile - 1] = strdup (value);
1069 }
1070 else if (path != NULL)
1071 {
1072 /* Use the normalized value. */
1073 m->tile_path[tile - 1] = strdup (path);
1074 }
1075 } /* end if tile direction (in)valid */
1076 }
1077 else
1078 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1079 }
1080
1081 if (!key || strcmp (key, "end"))
1082 { 817 }
1083 LOG (llevError, "Got premature eof on map header!\n");
1084 return 1;
1085 }
1086 818
1087 return 0; 819 abort ();
1088} 820}
1089 821
1090/* 822bool
1091 * Opens the file "filename" and reads information about the map 823maptile::_load_header (const char *path)
1092 * from the given file, and stores it in a newly allocated
1093 * maptile. A pointer to this structure is returned, or NULL on failure.
1094 * flags correspond to those in map.h. Main ones used are
1095 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1096 * MAP_BLOCK, in which case we block on this load. This happens in all
1097 * cases, no matter if this flag is set or not.
1098 * MAP_STYLE: style map - don't add active objects, don't add to server
1099 * managed map list.
1100 */
1101
1102maptile *
1103load_original_map (const char *filename, int flags)
1104{ 824{
1105 maptile *m;
1106 char pathname[MAX_BUF];
1107
1108 if (flags & MAP_PLAYER_UNIQUE)
1109 strcpy (pathname, filename);
1110 else if (flags & MAP_OVERLAY)
1111 strcpy (pathname, create_overlay_pathname (filename));
1112 else
1113 strcpy (pathname, create_pathname (filename));
1114
1115 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1116
1117 object_thawer thawer (pathname); 825 object_thawer thawer (path);
1118 826
1119 if (!thawer) 827 if (!thawer)
1120 return 0; 828 return false;
1121 829
1122 m = get_linked_map (); 830 return _load_header (thawer);
1123
1124 strcpy (m->path, filename);
1125 if (load_map_header (thawer, m))
1126 {
1127 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1128 delete_map (m);
1129 return 0;
1130 }
1131
1132 m->allocate ();
1133
1134 m->in_memory = MAP_LOADING;
1135 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1136
1137 m->in_memory = MAP_IN_MEMORY;
1138 if (!m->difficulty)
1139 m->difficulty = calculate_difficulty (m);
1140 set_map_reset_time (m);
1141 m->instantiate ();
1142 return (m);
1143}
1144
1145/*
1146 * Loads a map, which has been loaded earlier, from file.
1147 * Return the map object we load into (this can change from the passed
1148 * option if we can't find the original map)
1149 */
1150
1151static maptile *
1152load_temporary_map (maptile *m)
1153{
1154 char buf[MAX_BUF];
1155
1156 if (!m->tmpname)
1157 {
1158 LOG (llevError, "No temporary filename for map %s\n", m->path);
1159 strcpy (buf, m->path);
1160 delete_map (m);
1161 m = load_original_map (buf, 0);
1162 if (m == NULL)
1163 return NULL;
1164 fix_auto_apply (m); /* Chests which open as default */
1165 return m;
1166 }
1167
1168 object_thawer thawer (m->tmpname);
1169
1170 if (!thawer)
1171 {
1172 strcpy (buf, m->path);
1173 delete_map (m);
1174 m = load_original_map (buf, 0);
1175 if (!m)
1176 return NULL;
1177 fix_auto_apply (m); /* Chests which open as default */
1178 return m;
1179 }
1180
1181 if (load_map_header (thawer, m))
1182 {
1183 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1184 delete_map (m);
1185 m = load_original_map (m->path, 0);
1186 return NULL;
1187 }
1188
1189 m->allocate ();
1190
1191 m->in_memory = MAP_LOADING;
1192 load_objects (m, thawer, 0);
1193
1194 m->in_memory = MAP_IN_MEMORY;
1195 INVOKE_MAP (SWAPIN, m);
1196 return m;
1197}
1198
1199/*
1200 * Loads a map, which has been loaded earlier, from file.
1201 * Return the map object we load into (this can change from the passed
1202 * option if we can't find the original map)
1203 */
1204
1205maptile *
1206load_overlay_map (const char *filename, maptile *m)
1207{
1208 char pathname[MAX_BUF];
1209
1210 strcpy (pathname, create_overlay_pathname (filename));
1211
1212 object_thawer thawer (pathname);
1213
1214 if (!thawer)
1215 return m;
1216
1217 if (load_map_header (thawer, m))
1218 {
1219 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1220 delete_map (m);
1221 m = load_original_map (m->path, 0);
1222 return 0;
1223 }
1224 /*m->allocate ();*/
1225
1226 m->in_memory = MAP_LOADING;
1227 load_objects (m, thawer, MAP_OVERLAY);
1228
1229 m->in_memory = MAP_IN_MEMORY;
1230 return m;
1231} 831}
1232 832
1233/****************************************************************************** 833/******************************************************************************
1234 * This is the start of unique map handling code 834 * This is the start of unique map handling code
1235 *****************************************************************************/ 835 *****************************************************************************/
1236 836
1237/* 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. */
1238static void 838void
1239delete_unique_items (maptile *m) 839maptile::clear_unique_items ()
1240{ 840{
1241 int i, j, unique; 841 for (int i = 0; i < size (); ++i)
1242 object *op, *next;
1243
1244 for (i = 0; i < m->width; i++)
1245 for (j = 0; j < m->height; j++)
1246 { 842 {
1247 unique = 0; 843 int unique = 0;
1248 844 for (object *op = spaces [i].bot; op; )
1249 for (op = GET_MAP_OB (m, i, j); op; op = next)
1250 { 845 {
1251 next = op->above; 846 object *above = op->above;
1252 847
1253 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))
1254 unique = 1; 849 unique = 1;
1255 850
1256 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 851 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1257 { 852 {
1258 op->destroy_inv (false); 853 op->destroy_inv (false);
1259 op->destroy (); 854 op->destroy ();
1260 } 855 }
1261 }
1262 }
1263}
1264 856
1265 857 op = above;
1266/*
1267 * Loads unique objects from file(s) into the map which is in memory
1268 * m is the map to load unique items into.
1269 */
1270static void
1271load_unique_objects (maptile *m)
1272{
1273 int count;
1274 char firstname[MAX_BUF];
1275
1276 for (count = 0; count < 10; count++)
1277 {
1278 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1279 if (!access (firstname, R_OK))
1280 break;
1281 }
1282 /* If we get here, we did not find any map */
1283 if (count == 10)
1284 return;
1285
1286 object_thawer thawer (firstname);
1287
1288 if (!thawer)
1289 return;
1290
1291 m->in_memory = MAP_LOADING;
1292 if (m->tmpname == NULL) /* if we have loaded unique items from */
1293 delete_unique_items (m); /* original map before, don't duplicate them */
1294
1295 load_objects (m, thawer, 0);
1296
1297 m->in_memory = MAP_IN_MEMORY;
1298}
1299
1300/*
1301 * Saves a map to file. If flag is set, it is saved into the same
1302 * file it was (originally) loaded from. Otherwise a temporary
1303 * filename will be genarated, and the file will be stored there.
1304 * The temporary filename will be stored in the maptileure.
1305 * If the map is unique, we also save to the filename in the map
1306 * (this should have been updated when first loaded)
1307 */
1308int
1309new_save_map (maptile *m, int flag)
1310{
1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1312 int i;
1313
1314 if (flag && !*m->path)
1315 {
1316 LOG (llevError, "Tried to save map without path.\n");
1317 return -1;
1318 }
1319
1320 if (flag || (m->unique) || (m->templatemap))
1321 {
1322 if (!m->unique && !m->templatemap)
1323 { /* flag is set */
1324 if (flag == 2)
1325 strcpy (filename, create_overlay_pathname (m->path));
1326 else
1327 strcpy (filename, create_pathname (m->path));
1328 } 858 }
1329 else
1330 strcpy (filename, m->path);
1331
1332 make_path_to_file (filename);
1333 }
1334 else
1335 { 859 }
1336 if (!m->tmpname) 860}
1337 m->tmpname = tempnam (settings.tmpdir, NULL);
1338 861
1339 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)
1340 } 880 {
881 char shop[MAX_BUF];
882 print_shop_string (this, shop);
883 MAP_OUT2 (shopitems, shop);
884 }
1341 885
1342 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 886 MAP_OUT (shopgreed);
1343 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);
1344 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{
1345 object_freezer freezer; 924 object_freezer freezer;
1346 925
1347 /* legacy */ 926 if (!_save_header (freezer))
1348 fprintf (freezer, "arch map\n"); 927 return false;
1349 if (m->name)
1350 fprintf (freezer, "name %s\n", m->name);
1351 if (!flag)
1352 fprintf (freezer, "swap_time %d\n", m->swap_time);
1353 if (m->reset_timeout)
1354 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1355 if (m->fixed_resettime)
1356 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1357 /* we unfortunately have no idea if this is a value the creator set
1358 * or a difficulty value we generated when the map was first loaded
1359 */
1360 if (m->difficulty)
1361 fprintf (freezer, "difficulty %d\n", m->difficulty);
1362 if (m->region)
1363 fprintf (freezer, "region %s\n", m->region->name);
1364 if (m->shopitems)
1365 {
1366 print_shop_string (m, shop);
1367 fprintf (freezer, "shopitems %s\n", shop);
1368 }
1369 if (m->shopgreed)
1370 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1371 if (m->shopmin)
1372 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1373 if (m->shopmax)
1374 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1375 if (m->shoprace)
1376 fprintf (freezer, "shoprace %s\n", m->shoprace);
1377 if (m->darkness)
1378 fprintf (freezer, "darkness %d\n", m->darkness);
1379 if (m->width)
1380 fprintf (freezer, "width %d\n", m->width);
1381 if (m->height)
1382 fprintf (freezer, "height %d\n", m->height);
1383 if (m->enter_x)
1384 fprintf (freezer, "enter_x %d\n", m->enter_x);
1385 if (m->enter_y)
1386 fprintf (freezer, "enter_y %d\n", m->enter_y);
1387 if (m->msg)
1388 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1389 if (m->maplore)
1390 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1391 if (m->unique)
1392 fprintf (freezer, "unique %d\n", m->unique);
1393 if (m->templatemap)
1394 fprintf (freezer, "template %d\n", m->templatemap);
1395 if (m->outdoor)
1396 fprintf (freezer, "outdoor %d\n", m->outdoor);
1397 if (m->temp)
1398 fprintf (freezer, "temp %d\n", m->temp);
1399 if (m->pressure)
1400 fprintf (freezer, "pressure %d\n", m->pressure);
1401 if (m->humid)
1402 fprintf (freezer, "humid %d\n", m->humid);
1403 if (m->windspeed)
1404 fprintf (freezer, "windspeed %d\n", m->windspeed);
1405 if (m->winddir)
1406 fprintf (freezer, "winddir %d\n", m->winddir);
1407 if (m->sky)
1408 fprintf (freezer, "sky %d\n", m->sky);
1409 if (m->nosmooth)
1410 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1411 928
1412 /* Save any tiling information, except on overlays */ 929 return freezer.save (path);
1413 if (flag != 2)
1414 for (i = 0; i < 4; i++)
1415 if (m->tile_path[i])
1416 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1417
1418 freezer.put (m);
1419 fprintf (freezer, "end\n");
1420
1421 /* In the game save unique items in the different file, but
1422 * in the editor save them to the normal map file.
1423 * If unique map, save files in the proper destination (set by
1424 * player)
1425 */
1426 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1427 {
1428 object_freezer unique;
1429
1430 if (flag == 2)
1431 save_objects (m, freezer, unique, 2);
1432 else
1433 save_objects (m, freezer, unique, 0);
1434
1435 sprintf (buf, "%s.v00", create_items_path (m->path));
1436
1437 unique.save (buf);
1438 }
1439 else
1440 { /* save same file when not playing, like in editor */
1441 save_objects (m, freezer, freezer, 0);
1442 }
1443
1444 freezer.save (filename);
1445
1446 return 0;
1447} 930}
1448 931
1449/* 932/*
1450 * Remove and free all objects in the given map. 933 * Remove and free all objects in the given map.
1451 */ 934 */
1452void 935void
1453free_all_objects (maptile *m) 936maptile::clear ()
1454{ 937{
1455 if (!m->spaces) 938 if (!spaces)
1456 return; 939 return;
1457 940
1458 for (int i = 0; i < m->width; i++) 941 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1459 for (int j = 0; j < m->height; j++) 942 while (object *op = ms->bot)
1460 { 943 {
1461 mapspace &ms = m->at (i, j);
1462
1463 while (object *op = ms.bot)
1464 {
1465 if (op->head) 944 if (op->head)
1466 op = op->head; 945 op = op->head;
1467 946
1468 op->destroy_inv (false); 947 op->destroy_inv (false);
1469 op->destroy (); 948 op->destroy ();
1470 }
1471 } 949 }
1472}
1473 950
1474/* 951 sfree (spaces, size ()), spaces = 0;
1475 * Frees everything allocated by the given maptileure. 952
1476 * don't free tmpname - our caller is left to do that 953 if (buttons)
1477 */ 954 free_objectlinkpt (buttons), buttons = 0;
955}
956
1478void 957void
1479free_map (maptile *m, int flag) 958maptile::clear_header ()
1480{ 959{
1481 if (!m->in_memory) //TODO: makes no sense to me? 960 name = 0;
1482 return; 961 msg = 0;
1483 962 maplore = 0;
1484 m->in_memory = MAP_SAVING; 963 shoprace = 0;
1485
1486 // TODO: use new/delete
1487
1488 if (flag && m->spaces)
1489 free_all_objects (m);
1490
1491 free (m->name), m->name = 0;
1492 free (m->spaces), m->spaces = 0;
1493 free (m->msg), m->msg = 0;
1494 free (m->maplore), m->maplore = 0;
1495 free (m->shoprace), m->shoprace = 0;
1496 delete [] m->shopitems, m->shopitems = 0; 964 delete [] shopitems, shopitems = 0;
1497
1498 if (m->buttons)
1499 free_objectlinkpt (m->buttons), m->buttons = 0;
1500 965
1501 for (int i = 0; i < 4; i++) 966 for (int i = 0; i < 4; i++)
1502 {
1503 if (m->tile_path[i])
1504 free (m->tile_path[i]), m->tile_path[i] = 0;
1505
1506 m->tile_map[i] = 0; 967 tile_path [i] = 0;
1507 }
1508
1509 m->in_memory = MAP_SWAPPED;
1510} 968}
1511 969
1512maptile::~maptile () 970maptile::~maptile ()
1513{ 971{
1514 free_map (this, 1); 972 assert (destroyed ());
1515 free (tmpname);
1516} 973}
1517 974
1518void 975void
1519maptile::do_destroy () 976maptile::clear_links_to (maptile *m)
1520{ 977{
1521 attachable::do_destroy ();
1522
1523 free_all_objects (this);
1524
1525 /* 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
1526 * are pointing at this one for tiling information. Since 979 * are pointing at this one for tiling information. Since
1527 * 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
1528 * maps this map tiles with and clears those. 981 * maps this map tiles with and clears those.
1529 */ 982 */
1530 //TODO: non-euclidean-tiling MUST GO
1531 for (maptile *m = first_map; m; m = m->next)
1532 for (int i = 0; i < 4; i++) 983 for (int i = 0; i < 4; i++)
1533 if (m->tile_map[i] == this) 984 if (tile_map[i] == m)
1534 m->tile_map[i] = 0; 985 tile_map[i] = 0;
1535
1536 if (first_map == this)
1537 first_map = next;
1538 else
1539 for (maptile *m = first_map; m; m = m->next)
1540 if (m->next = this)
1541 {
1542 m->next = next;
1543 break;
1544 }
1545} 986}
1546 987
1547//TODO: must go
1548void 988void
1549delete_map (maptile *m) 989maptile::do_destroy ()
1550{ 990{
1551 if (m) 991 attachable::do_destroy ();
1552 m->destroy (); 992
993 clear ();
1553} 994}
1554 995
1555/* 996/*
1556 * Makes sure the given map is loaded and swapped in. 997 * Updates every button on the map (by calling update_button() for them).
1557 * name is path name of the map.
1558 * flags meaning:
1559 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1560 * and don't do unique items or the like.
1561 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1562 * dont do any more name translation on it.
1563 * 998 */
1564 * Returns a pointer to the given map. 999void
1565 */ 1000maptile::update_buttons ()
1566maptile *
1567ready_map_name (const char *name, int flags)
1568{ 1001{
1569 if (!name) 1002 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1570 return 0; 1003 for (objectlink *ol = obp->link; ol; ol = ol->next)
1571
1572 /* Have we been at this level before? */
1573 maptile *m = has_been_loaded (name);
1574
1575 /* Map is good to go, so just return it */
1576 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1577 return m;
1578
1579 /* unique maps always get loaded from their original location, and never
1580 * a temp location. Likewise, if map_flush is set, or we have never loaded
1581 * this map, load it now. I removed the reset checking from here -
1582 * it seems the probability of a player trying to enter a map that should
1583 * reset but hasn't yet is quite low, and removing that makes this function
1584 * a bit cleaner (and players probably shouldn't rely on exact timing for
1585 * resets in any case - if they really care, they should use the 'maps command.
1586 */
1587 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1588 { 1004 {
1589 /* first visit or time to reset */ 1005 if (!ol->ob)
1590 if (m)
1591 { 1006 {
1592 clean_tmp_map (m); /* Doesn't make much difference */ 1007 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1593 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;
1594 } 1010 }
1595 1011
1596 /* create and load a map */ 1012 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1597 if (flags & MAP_PLAYER_UNIQUE)
1598 LOG (llevDebug, "Trying to load map %s.\n", name);
1599 else
1600 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1601
1602 //eval_pv ("$x = Event::time", 1);//D
1603 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1604 return (NULL);
1605 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1606
1607 fix_auto_apply (m); /* Chests which open as default */
1608
1609 /* If a player unique map, no extra unique object file to load.
1610 * if from the editor, likewise.
1611 */
1612 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1613 load_unique_objects (m);
1614
1615 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1616 { 1013 {
1617 m = load_overlay_map (name, m); 1014 update_button (ol->ob);
1618 if (m == NULL) 1015 break;
1619 return NULL;
1620 } 1016 }
1621
1622 if (flags & MAP_PLAYER_UNIQUE)
1623 INVOKE_MAP (SWAPIN, m);
1624
1625 } 1017 }
1626 else
1627 {
1628 /* If in this loop, we found a temporary map, so load it up. */
1629
1630 m = load_temporary_map (m);
1631 if (m == NULL)
1632 return NULL;
1633 load_unique_objects (m);
1634
1635 clean_tmp_map (m);
1636 m->in_memory = MAP_IN_MEMORY;
1637 /* tempnam() on sun systems (probably others) uses malloc
1638 * to allocated space for the string. Free it here.
1639 * In some cases, load_temporary_map above won't find the
1640 * temporary map, and so has reloaded a new map. If that
1641 * is the case, tmpname is now null
1642 */
1643 if (m->tmpname)
1644 free (m->tmpname);
1645 m->tmpname = NULL;
1646 /* It's going to be saved anew anyway */
1647 }
1648
1649 /* Below here is stuff common to both first time loaded maps and
1650 * temp maps.
1651 */
1652
1653 decay_objects (m); /* start the decay */
1654 /* In case other objects press some buttons down */
1655 update_buttons (m);
1656 if (m->outdoor)
1657 set_darkness_map (m);
1658 /* run the weather over this map */
1659 weather_effect (name);
1660 return m;
1661} 1018}
1662
1663 1019
1664/* 1020/*
1665 * 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.
1666 * difficulty does not have a lot to do with character level, 1022 * difficulty does not have a lot to do with character level,
1667 * 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.
1669 * 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
1670 * 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
1671 * have a difficulty set than using this function - human calculation 1027 * have a difficulty set than using this function - human calculation
1672 * is much better than this functions guesswork. 1028 * is much better than this functions guesswork.
1673 */ 1029 */
1674
1675int 1030int
1676calculate_difficulty (maptile *m) 1031maptile::estimate_difficulty () const
1677{ 1032{
1678 object *op;
1679 archetype *at;
1680 int x, y, i;
1681 long monster_cnt = 0; 1033 long monster_cnt = 0;
1682 double avgexp = 0; 1034 double avgexp = 0;
1683 sint64 total_exp = 0; 1035 sint64 total_exp = 0;
1684 1036
1685 if (m->difficulty) 1037 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1686 { 1038 for (object *op = ms->bot; op; op = op->above)
1687 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1688 return m->difficulty;
1689 }
1690
1691 for (x = 0; x < m->width; x++)
1692 for (y = 0; y < m->height; y++)
1693 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1694 { 1039 {
1695 if (QUERY_FLAG (op, FLAG_MONSTER)) 1040 if (QUERY_FLAG (op, FLAG_MONSTER))
1696 { 1041 {
1697 total_exp += op->stats.exp; 1042 total_exp += op->stats.exp;
1698 monster_cnt++; 1043 monster_cnt++;
1699 } 1044 }
1700 1045
1701 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1046 if (QUERY_FLAG (op, FLAG_GENERATOR))
1702 { 1047 {
1703 total_exp += op->stats.exp; 1048 total_exp += op->stats.exp;
1049
1704 at = type_to_archetype (GENERATE_TYPE (op)); 1050 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1705
1706 if (at != NULL)
1707 total_exp += at->clone.stats.exp * 8; 1051 total_exp += at->clone.stats.exp * 8;
1708 1052
1709 monster_cnt++; 1053 monster_cnt++;
1710 } 1054 }
1711 } 1055 }
1712 1056
1713 avgexp = (double) total_exp / monster_cnt; 1057 avgexp = (double) total_exp / monster_cnt;
1714 1058
1715 for (i = 1; i <= settings.max_level; i++) 1059 for (int i = 1; i <= settings.max_level; i++)
1716 {
1717 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))
1718 {
1719 /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1720 return i; 1061 return i;
1721 }
1722 }
1723 1062
1724 return 1; 1063 return 1;
1725}
1726
1727void
1728clean_tmp_map (maptile *m)
1729{
1730 if (m->tmpname == NULL)
1731 return;
1732 INVOKE_MAP (CLEAN, m);
1733 (void) unlink (m->tmpname);
1734}
1735
1736void
1737free_all_maps (void)
1738{
1739 int real_maps = 0;
1740
1741 while (first_map)
1742 {
1743 /* I think some of the callers above before it gets here set this to be
1744 * saving, but we still want to free this data
1745 */
1746 if (first_map->in_memory == MAP_SAVING)
1747 first_map->in_memory = MAP_IN_MEMORY;
1748 delete_map (first_map);
1749 real_maps++;
1750 }
1751 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1752} 1064}
1753 1065
1754/* change_map_light() - used to change map light level (darkness) 1066/* change_map_light() - used to change map light level (darkness)
1755 * up or down. Returns true if successful. It should now be 1067 * up or down. Returns true if successful. It should now be
1756 * possible to change a value by more than 1. 1068 * possible to change a value by more than 1.
1757 * 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
1758 * to maps than los. 1070 * to maps than los.
1759 * postive values make it darker, negative make it brighter 1071 * postive values make it darker, negative make it brighter
1760 */ 1072 */
1761
1762int 1073int
1763change_map_light (maptile *m, int change) 1074maptile::change_map_light (int change)
1764{ 1075{
1765 int new_level = m->darkness + change; 1076 int new_level = darkness + change;
1766 1077
1767 /* Nothing to do */ 1078 /* Nothing to do */
1768 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))
1769 {
1770 return 0; 1080 return 0;
1771 }
1772 1081
1773 /* inform all players on the map */ 1082 /* inform all players on the map */
1774 if (change > 0) 1083 if (change > 0)
1775 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); 1084 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1776 else 1085 else
1777 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); 1086 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1778 1087
1779 /* Do extra checking. since m->darkness is a unsigned value, 1088 /* Do extra checking. since darkness is a unsigned value,
1780 * we need to be extra careful about negative values. 1089 * we need to be extra careful about negative values.
1781 * In general, the checks below are only needed if change 1090 * In general, the checks below are only needed if change
1782 * is not +/-1 1091 * is not +/-1
1783 */ 1092 */
1784 if (new_level < 0) 1093 if (new_level < 0)
1785 m->darkness = 0; 1094 darkness = 0;
1786 else if (new_level >= MAX_DARKNESS) 1095 else if (new_level >= MAX_DARKNESS)
1787 m->darkness = MAX_DARKNESS; 1096 darkness = MAX_DARKNESS;
1788 else 1097 else
1789 m->darkness = new_level; 1098 darkness = new_level;
1790 1099
1791 /* All clients need to get re-updated for the change */ 1100 /* All clients need to get re-updated for the change */
1792 update_all_map_los (m); 1101 update_all_map_los (this);
1793 return 1; 1102 return 1;
1794} 1103}
1795 1104
1796/* 1105/*
1797 * This function updates various attributes about a specific space 1106 * This function updates various attributes about a specific space
1801 */ 1110 */
1802void 1111void
1803mapspace::update_ () 1112mapspace::update_ ()
1804{ 1113{
1805 object *tmp, *last = 0; 1114 object *tmp, *last = 0;
1806 uint8 flags = 0, light = 0, anywhere = 0; 1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1807 New_Face *top, *floor, *middle; 1116 New_Face *top, *floor, *middle;
1808 object *top_obj, *floor_obj, *middle_obj; 1117 object *top_obj, *floor_obj, *middle_obj;
1809 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1118 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1810 1119
1811 middle = blank_face; 1120 middle = blank_face;
1928 1237
1929 /* If two top faces are already set, quit processing */ 1238 /* If two top faces are already set, quit processing */
1930 if ((top != blank_face) && (middle != blank_face)) 1239 if ((top != blank_face) && (middle != blank_face))
1931 break; 1240 break;
1932 1241
1933 /* Only show visible faces, unless its the editor - show all */ 1242 /* Only show visible faces */
1934 if (!tmp->invisible || editor) 1243 if (!tmp->invisible)
1935 { 1244 {
1936 /* Fill in top if needed */ 1245 /* Fill in top if needed */
1937 if (top == blank_face) 1246 if (top == blank_face)
1938 { 1247 {
1939 top = tmp->face; 1248 top = tmp->face;
1969 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;
1970 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;
1971 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;
1972} 1281}
1973 1282
1974void
1975set_map_reset_time (maptile *map)
1976{
1977 int timeout;
1978
1979 timeout = map->reset_timeout;
1980 if (timeout <= 0)
1981 timeout = MAP_DEFAULTRESET;
1982 if (timeout >= MAP_MAXRESET)
1983 timeout = MAP_MAXRESET;
1984 map->reset_time = time (0) + timeout;
1985}
1986
1987/* 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
1988 * 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
1989 * 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
1990 * the value of orig_map->tile_map[tile_num]. It really only does this 1286 * the value of orig_map->tile_map[tile_num].
1991 * so that it is easier for calling functions to verify success.
1992 */ 1287 */
1993
1994static maptile * 1288static inline maptile *
1995load_and_link_tiled_map (maptile *orig_map, int tile_num) 1289find_and_link (maptile *orig_map, int tile_num)
1996{ 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
1997 int dest_tile = (tile_num + 2) % 4; 1308 int dest_tile = (tile_num + 2) % 4;
1998 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
1999 1309
2000 orig_map->tile_map[tile_num] = ready_map_name (path, 0); 1310 orig_map->tile_map [tile_num] = mp;
2001 1311
2002 /* 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
2003 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)
2004 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;
2005 1316
2006 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 ();
2007} 1324}
2008 1325
2009/* this returns TRUE if the coordinates (x,y) are out of 1326/* this returns TRUE if the coordinates (x,y) are out of
2010 * map m. This function also takes into account any 1327 * map m. This function also takes into account any
2011 * tiling considerations, loading adjacant maps as needed. 1328 * tiling considerations, loading adjacant maps as needed.
2012 * This is the function should always be used when it 1329 * This is the function should always be used when it
2013 * necessary to check for valid coordinates. 1330 * necessary to check for valid coordinates.
2014 * This function will recursively call itself for the 1331 * This function will recursively call itself for the
2015 * tiled maps. 1332 * tiled maps.
2016 *
2017 *
2018 */ 1333 */
2019int 1334int
2020out_of_map (maptile *m, int x, int y) 1335out_of_map (maptile *m, int x, int y)
2021{ 1336{
2022 /* If we get passed a null map, this is obviously the 1337 /* If we get passed a null map, this is obviously the
2030 { 1345 {
2031 if (!m->tile_path[3]) 1346 if (!m->tile_path[3])
2032 return 1; 1347 return 1;
2033 1348
2034 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)
2035 load_and_link_tiled_map (m, 3); 1350 find_and_link (m, 3);
2036 1351
2037 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);
2038 } 1353 }
2039 1354
2040 if (x >= m->width) 1355 if (x >= m->width)
2041 { 1356 {
2042 if (!m->tile_path[1]) 1357 if (!m->tile_path[1])
2043 return 1; 1358 return 1;
2044 1359
2045 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)
2046 load_and_link_tiled_map (m, 1); 1361 find_and_link (m, 1);
2047 1362
2048 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);
2049 } 1364 }
2050 1365
2051 if (y < 0) 1366 if (y < 0)
2052 { 1367 {
2053 if (!m->tile_path[0]) 1368 if (!m->tile_path[0])
2054 return 1; 1369 return 1;
2055 1370
2056 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)
2057 load_and_link_tiled_map (m, 0); 1372 find_and_link (m, 0);
2058 1373
2059 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);
2060 } 1375 }
2061 1376
2062 if (y >= m->height) 1377 if (y >= m->height)
2063 { 1378 {
2064 if (!m->tile_path[2]) 1379 if (!m->tile_path[2])
2065 return 1; 1380 return 1;
2066 1381
2067 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)
2068 load_and_link_tiled_map (m, 2); 1383 find_and_link (m, 2);
2069 1384
2070 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);
2071 } 1386 }
2072 1387
2073 /* Simple case - coordinates are within this local 1388 /* Simple case - coordinates are within this local
2074 * map. 1389 * map.
2075 */ 1390 */
2078 1393
2079/* This is basically the same as out_of_map above, but 1394/* This is basically the same as out_of_map above, but
2080 * instead we return NULL if no map is valid (coordinates 1395 * instead we return NULL if no map is valid (coordinates
2081 * out of bounds and no tiled map), otherwise it returns 1396 * out of bounds and no tiled map), otherwise it returns
2082 * the map as that the coordinates are really on, and 1397 * the map as that the coordinates are really on, and
2083 * updates x and y to be the localized coordinates. 1398 * updates x and y to be the localised coordinates.
2084 * Using this is more efficient of calling out_of_map 1399 * Using this is more efficient of calling out_of_map
2085 * and then figuring out what the real map is 1400 * and then figuring out what the real map is
2086 */ 1401 */
2087maptile * 1402maptile *
2088get_map_from_coord (maptile *m, sint16 * x, sint16 * y) 1403maptile::xy_find (sint16 &x, sint16 &y)
2089{ 1404{
2090
2091 if (*x < 0) 1405 if (x < 0)
2092 { 1406 {
2093 if (!m->tile_path[3]) 1407 if (!tile_path[3])
2094 return 0; 1408 return 0;
2095 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2096 load_and_link_tiled_map (m, 3);
2097 1409
1410 find_and_link (this, 3);
2098 *x += m->tile_map[3]->width; 1411 x += tile_map[3]->width;
2099 return (get_map_from_coord (m->tile_map[3], x, y)); 1412 return tile_map[3]->xy_find (x, y);
2100 } 1413 }
2101 1414
2102 if (*x >= m->width) 1415 if (x >= width)
2103 { 1416 {
2104 if (!m->tile_path[1]) 1417 if (!tile_path[1])
2105 return 0; 1418 return 0;
2106 1419
2107 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1420 find_and_link (this, 1);
2108 load_and_link_tiled_map (m, 1);
2109
2110 *x -= m->width; 1421 x -= width;
2111 return (get_map_from_coord (m->tile_map[1], x, y)); 1422 return tile_map[1]->xy_find (x, y);
2112 } 1423 }
2113 1424
2114 if (*y < 0) 1425 if (y < 0)
2115 { 1426 {
2116 if (!m->tile_path[0]) 1427 if (!tile_path[0])
2117 return 0; 1428 return 0;
2118 1429
2119 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1430 find_and_link (this, 0);
2120 load_and_link_tiled_map (m, 0);
2121
2122 *y += m->tile_map[0]->height; 1431 y += tile_map[0]->height;
2123 return (get_map_from_coord (m->tile_map[0], x, y)); 1432 return tile_map[0]->xy_find (x, y);
2124 } 1433 }
2125 1434
2126 if (*y >= m->height) 1435 if (y >= height)
2127 { 1436 {
2128 if (!m->tile_path[2]) 1437 if (!tile_path[2])
2129 return 0; 1438 return 0;
2130 1439
2131 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1440 find_and_link (this, 2);
2132 load_and_link_tiled_map (m, 2);
2133
2134 *y -= m->height; 1441 y -= height;
2135 return (get_map_from_coord (m->tile_map[2], x, y)); 1442 return tile_map[2]->xy_find (x, y);
2136 } 1443 }
2137 1444
2138 /* Simple case - coordinates are within this local 1445 /* Simple case - coordinates are within this local
2139 * map. 1446 * map.
2140 */ 1447 */
2141
2142 return m; 1448 return this;
2143} 1449}
2144 1450
2145/** 1451/**
2146 * 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
2147 * map1 to map2 in dx/dy. 1453 * map1 to map2 in dx/dy.
2150adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
2151{ 1457{
2152 if (!map1 || !map2) 1458 if (!map1 || !map2)
2153 return 0; 1459 return 0;
2154 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!)
2155 if (map1 == map2) 1463 if (map1 == map2)
2156 { 1464 {
2157 *dx = 0; 1465 *dx = 0;
2158 *dy = 0; 1466 *dy = 0;
2159
2160 } 1467 }
2161 else if (map1->tile_map[0] == map2) 1468 else if (map1->tile_map[0] == map2)
2162 { /* up */ 1469 { /* up */
2163 *dx = 0; 1470 *dx = 0;
2164 *dy = -map2->height; 1471 *dy = -map2->height;
2175 } 1482 }
2176 else if (map1->tile_map[3] == map2) 1483 else if (map1->tile_map[3] == map2)
2177 { /* left */ 1484 { /* left */
2178 *dx = -map2->width; 1485 *dx = -map2->width;
2179 *dy = 0; 1486 *dy = 0;
2180
2181 } 1487 }
2182 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)
2183 { /* up right */ 1489 { /* up right */
2184 *dx = map1->tile_map[0]->width; 1490 *dx = map1->tile_map[0]->width;
2185 *dy = -map1->tile_map[0]->height; 1491 *dy = -map1->tile_map[0]->height;
2216 } 1522 }
2217 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)
2218 { /* left down */ 1524 { /* left down */
2219 *dx = -map1->tile_map[3]->width; 1525 *dx = -map1->tile_map[3]->width;
2220 *dy = map1->tile_map[3]->height; 1526 *dy = map1->tile_map[3]->height;
2221
2222 } 1527 }
2223 else 1528 else
2224 { /* not "adjacent" enough */
2225 return 0; 1529 return 0;
2226 }
2227 1530
2228 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);
2229} 1549}
2230 1550
2231/* From map.c 1551/* From map.c
2232 * This is used by get_player to determine where the other 1552 * This is used by get_player to determine where the other
2233 * creature is. get_rangevector takes into account map tiling, 1553 * creature is. get_rangevector takes into account map tiling,
2246 * be unexpected 1566 * be unexpected
2247 * 1567 *
2248 * currently, the only flag supported (0x1) is don't translate for 1568 * currently, the only flag supported (0x1) is don't translate for
2249 * closest body part of 'op1' 1569 * closest body part of 'op1'
2250 */ 1570 */
2251
2252void 1571void
2253get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1572get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2254{ 1573{
2255 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))
2256 { 1575 {
2289 { 1608 {
2290 best_distance = tmpi; 1609 best_distance = tmpi;
2291 best = tmp; 1610 best = tmp;
2292 } 1611 }
2293 } 1612 }
1613
2294 if (best != op1) 1614 if (best != op1)
2295 { 1615 {
2296 retval->distance_x += op1->x - best->x; 1616 retval->distance_x += op1->x - best->x;
2297 retval->distance_y += op1->y - best->y; 1617 retval->distance_y += op1->y - best->y;
2298 } 1618 }
2299 } 1619 }
1620
2300 retval->part = best; 1621 retval->part = best;
2301 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1622 retval->distance = idistance (retval->distance_x, retval->distance_y);
2302 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1623 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2303 } 1624 }
2304} 1625}
2305 1626
2306/* this is basically the same as get_rangevector above, but instead of 1627/* this is basically the same as get_rangevector above, but instead of
2330 { 1651 {
2331 retval->distance_x += op2->x - x; 1652 retval->distance_x += op2->x - x;
2332 retval->distance_y += op2->y - y; 1653 retval->distance_y += op2->y - y;
2333 1654
2334 retval->part = NULL; 1655 retval->part = NULL;
2335 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1656 retval->distance = idistance (retval->distance_x, retval->distance_y);
2336 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1657 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2337 } 1658 }
2338} 1659}
2339 1660
2340/* Returns true of op1 and op2 are effectively on the same map 1661/* Returns true of op1 and op2 are effectively on the same map
2341 * (as related to map tiling). Note that this looks for a path from 1662 * (as related to map tiling). Note that this looks for a path from
2342 * op1 to op2, so if the tiled maps are assymetric and op2 has a path 1663 * op1 to op2, so if the tiled maps are asymetric and op2 has a path
2343 * to op1, this will still return false. 1664 * to op1, this will still return false.
2344 * Note we only look one map out to keep the processing simple 1665 * Note we only look one map out to keep the processing simple
2345 * and efficient. This could probably be a macro. 1666 * and efficient. This could probably be a macro.
2346 * MSW 2001-08-05 1667 * MSW 2001-08-05
2347 */ 1668 */
2350{ 1671{
2351 int dx, dy; 1672 int dx, dy;
2352 1673
2353 return adjacent_map (op1->map, op2->map, &dx, &dy); 1674 return adjacent_map (op1->map, op2->map, &dx, &dy);
2354} 1675}
1676
1677object *
1678maptile::insert (object *op, int x, int y, object *originator, int flags)
1679{
1680 if (!op->flag [FLAG_REMOVED])
1681 op->remove ();
1682
1683 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1684}
1685

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines