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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines