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.49 by root, Mon Dec 25 14:54:44 2006 UTC vs.
Revision 1.87 by root, Thu Feb 15 21:07:48 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>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 25#include <unistd.h>
30 26
27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
31
31#include "path.h" 32#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 33
52/* 34/*
53 * This makes a path absolute outside the world of Crossfire. 35 * This makes a path absolute outside the world of Crossfire.
54 * In other words, it prepends LIBDIR/MAPDIR/ to the given path 36 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
55 * and returns the pointer to a static array containing the result. 37 * and returns the pointer to a static array containing the result.
56 * it really should be called create_mapname 38 * it really should be called create_mapname
57 */ 39 */
58
59const char * 40const char *
60create_pathname (const char *name) 41create_pathname (const char *name)
61{ 42{
62 static char buf[MAX_BUF]; 43 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); 44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
71 return (buf); 45 return buf;
72} 46}
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 47
139/* 48/*
140 * This function checks if a file with the given path exists. 49 * This function checks if a file with the given path exists.
141 * -1 is returned if it fails, otherwise the mode of the file 50 * -1 is returned if it fails, otherwise the mode of the file
142 * is returned. 51 * is returned.
149 * the rest of the code only cares that the file is readable. 58 * 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 59 * when the editor goes away, the call to stat should probably be
151 * replaced by an access instead (similar to the windows one, but 60 * replaced by an access instead (similar to the windows one, but
152 * that seems to be missing the prepend_dir processing 61 * that seems to be missing the prepend_dir processing
153 */ 62 */
154
155int 63int
156check_path (const char *name, int prepend_dir) 64check_path (const char *name, int prepend_dir)
157{ 65{
158 char buf[MAX_BUF]; 66 char buf[MAX_BUF];
159 67
160 char *endbuf; 68 char *endbuf;
161 struct stat statbuf; 69 struct stat statbuf;
162 int mode = 0; 70 int mode = 0;
163 71
164 if (prepend_dir) 72 if (prepend_dir)
165 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
166 else 74 else
167 strcpy (buf, name); 75 assign (buf, name);
168 76
169 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
170 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
171 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
172 * all the names. 80 * all the names.
185 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || 93 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)) 94 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
187 mode |= 2; 95 mode |= 2;
188 96
189 return (mode); 97 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} 98}
231 99
232/* This rolls up wall, blocks_magic, blocks_view, etc, all into 100/* This rolls up wall, blocks_magic, blocks_view, etc, all into
233 * one function that just returns a P_.. value (see map.h) 101 * one function that just returns a P_.. value (see map.h)
234 * it will also do map translation for tiled maps, returning 102 * it will also do map translation for tiled maps, returning
240 * don't expect to insert/remove anything from those spaces. 108 * don't expect to insert/remove anything from those spaces.
241 */ 109 */
242int 110int
243get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) 111get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
244{ 112{
245 sint16 newx, newy;
246 int retval = 0;
247 maptile *mp;
248
249 newx = x; 113 sint16 newx = x;
250 newy = y; 114 sint16 newy = y;
251 115
252 mp = get_map_from_coord (oldmap, &newx, &newy); 116 maptile *mp = get_map_from_coord (oldmap, &newx, &newy);
253 117
254 if (!mp) 118 if (!mp)
255 return P_OUT_OF_MAP; 119 return P_OUT_OF_MAP;
256
257 if (mp != oldmap)
258 retval |= P_NEW_MAP;
259 120
260 if (newmap) *newmap = mp; 121 if (newmap) *newmap = mp;
261 if (nx) *nx = newx; 122 if (nx) *nx = newx;
262 if (ny) *ny = newy; 123 if (ny) *ny = newy;
263 124
264 return retval | mp->at (newx, newy).flags (); 125 return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
265} 126}
266 127
267/* 128/*
268 * Returns true if the given coordinate is blocked except by the 129 * Returns true if the given coordinate is blocked except by the
269 * object passed is not blocking. This is used with 130 * object passed is not blocking. This is used with
368 229
369 } 230 }
370 return 0; 231 return 0;
371} 232}
372 233
373
374/* 234/*
375 * Returns true if the given object can't fit in the given spot. 235 * Returns true if the given object can't fit in the given spot.
376 * This is meant for multi space objects - for single space objecs, 236 * This is meant for multi space objects - for single space objecs,
377 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
378 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
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 if (thawer.kw == KW_end)
548 break;
549
550 thawer.skip_kv ();
551 }
552
553 return _load_objects (thawer);
554}
555
556bool
557maptile::_save_objects (const char *path, int flags)
558{
559 object_freezer freezer;
560
561 if (!_save_objects (freezer, flags))
562 return false;
563
564 return freezer.save (path);
633} 565}
634 566
635maptile::maptile () 567maptile::maptile ()
636{ 568{
637 in_memory = MAP_SWAPPED; 569 in_memory = MAP_SWAPPED;
570
638 /* The maps used to pick up default x and y values from the 571 /* The maps used to pick up default x and y values from the
639 * map archetype. Mimic that behaviour. 572 * map archetype. Mimic that behaviour.
640 */ 573 */
641 this->width = 16; 574 width = 16;
642 this->height = 16; 575 height = 16;
576 timeout = 300;
577 max_nrof = 1000; // 1000 items of anything
578 max_volume = 2000000; // 2m³
579}
580
581maptile::maptile (int w, int h)
582{
583 in_memory = MAP_SWAPPED;
584
585 width = w;
586 height = h;
643 this->reset_timeout = 0; 587 reset_timeout = 0;
644 this->timeout = 300; 588 timeout = 300;
645 this->enter_x = 0; 589 enter_x = 0;
646 this->enter_y = 0; 590 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}
651 591
652/* 592 alloc ();
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{
660 maptile *mp, *map = new maptile;
661
662 for (mp = first_map; mp && mp->next; mp = mp->next);
663
664 if (mp == NULL)
665 first_map = map;
666 else
667 mp->next = map;
668
669 return map;
670} 593}
671 594
672/* 595/*
673 * Allocates the arrays contained in a maptile. 596 * Allocates the arrays contained in a maptile.
674 * This basically allocates the dynamic array of spaces for the 597 * This basically allocates the dynamic array of spaces for the
675 * map. 598 * map.
676 */ 599 */
677void 600void
678maptile::allocate () 601maptile::alloc ()
679{ 602{
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) 603 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; 604 return;
605
606 spaces = salloc0<mapspace> (size ());
713} 607}
714 608
715/* Takes a string from a map definition and outputs a pointer to the array of shopitems 609/* 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 610 * corresponding to that string. Memory is allocated for this, it must be freed
717 * at a later date. 611 * at a later date.
718 * Called by parse_map_headers below. 612 * Called by parse_map_headers below.
719 */ 613 */
720
721static shopitems * 614static shopitems *
722parse_shop_string (const char *input_string) 615parse_shop_string (const char *input_string)
723{ 616{
724 char *shop_string, *p, *q, *next_semicolon, *next_colon; 617 char *shop_string, *p, *q, *next_semicolon, *next_colon;
725 shopitems *items = NULL; 618 shopitems *items = NULL;
734 p = strchr (p, ';'); 627 p = strchr (p, ';');
735 number_of_entries++; 628 number_of_entries++;
736 if (p) 629 if (p)
737 p++; 630 p++;
738 } 631 }
632
739 p = shop_string; 633 p = shop_string;
740 strip_endline (p); 634 strip_endline (p);
741 items = new shopitems[number_of_entries + 1]; 635 items = new shopitems[number_of_entries + 1];
742 for (i = 0; i < number_of_entries; i++) 636 for (i = 0; i < number_of_entries; i++)
743 { 637 {
744 if (!p) 638 if (!p)
745 { 639 {
746 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); 640 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
747 break; 641 break;
748 } 642 }
643
749 next_semicolon = strchr (p, ';'); 644 next_semicolon = strchr (p, ';');
750 next_colon = strchr (p, ':'); 645 next_colon = strchr (p, ':');
751 /* if there is a stregth specified, figure out what it is, we'll need it soon. */ 646 /* 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)) 647 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
753 items[i].strength = atoi (strchr (p, ':') + 1); 648 items[i].strength = atoi (strchr (p, ':') + 1);
780 * the next entry while we're at it, better print a warning 675 * the next entry while we're at it, better print a warning
781 */ 676 */
782 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); 677 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
783 } 678 }
784 } 679 }
680
785 items[i].index = number_of_entries; 681 items[i].index = number_of_entries;
786 if (next_semicolon) 682 if (next_semicolon)
787 p = ++next_semicolon; 683 p = ++next_semicolon;
788 else 684 else
789 p = NULL; 685 p = NULL;
790 } 686 }
687
791 free (shop_string); 688 free (shop_string);
792 return items; 689 return items;
793} 690}
794 691
795/* opposite of parse string, this puts the string that was originally fed in to 692/* opposite of parse string, this puts the string that was originally fed in to
804 for (i = 0; i < m->shopitems[0].index; i++) 701 for (i = 0; i < m->shopitems[0].index; i++)
805 { 702 {
806 if (m->shopitems[i].typenum) 703 if (m->shopitems[i].typenum)
807 { 704 {
808 if (m->shopitems[i].strength) 705 if (m->shopitems[i].strength)
809 {
810 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 706 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
811 }
812 else 707 else
813 sprintf (tmp, "%s;", m->shopitems[i].name); 708 sprintf (tmp, "%s;", m->shopitems[i].name);
814 } 709 }
815 else 710 else
816 { 711 {
817 if (m->shopitems[i].strength) 712 if (m->shopitems[i].strength)
818 {
819 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 713 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
820 }
821 else 714 else
822 sprintf (tmp, "*"); 715 sprintf (tmp, "*");
823 } 716 }
717
824 strcat (output_string, tmp); 718 strcat (output_string, tmp);
825 } 719 }
826} 720}
827 721
828/* This loads the header information of the map. The header 722/* This loads the header information of the map. The header
833 * put all the stuff in the map object so that names actually make 727 * put all the stuff in the map object so that names actually make
834 * sense. 728 * sense.
835 * This could be done in lex (like the object loader), but I think 729 * 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. 730 * currently, there are few enough fields this is not a big deal.
837 * MSW 2001-07-01 731 * MSW 2001-07-01
838 * return 0 on success, 1 on failure.
839 */ 732 */
840 733bool
841static int 734maptile::_load_header (object_thawer &thawer)
842load_map_header (object_thawer & fp, maptile *m)
843{ 735{
844 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; 736 for (;;)
845 int msgpos = 0;
846 int maplorepos = 0;
847
848 while (fgets (buf, HUGE_BUF, fp) != NULL)
849 { 737 {
850 buf[HUGE_BUF - 1] = 0; 738 keyword kw = thawer.get_kv ();
851 key = buf;
852 739
853 while (isspace (*key)) 740 switch (kw)
854 key++;
855
856 if (*key == 0)
857 continue; /* empty line */
858
859 value = strchr (key, ' ');
860
861 if (!value)
862 { 741 {
863 if ((end = strchr (key, '\n'))) 742 case KW_msg:
864 *end = 0; 743 thawer.get_ml (KW_endmsg, msg);
744 break;
745
746 case KW_lore: // CF+ extension
747 thawer.get_ml (KW_endlore, maplore);
748 break;
749
750 case KW_maplore:
751 thawer.get_ml (KW_endmaplore, maplore);
752 break;
753
754 case KW_arch:
755 if (strcmp (thawer.get_str (), "map"))
756 LOG (llevError, "%s: loading map and got a non 'arch map' line (arch %s), skipping.\n", &path, thawer.get_str ());
757 break;
758
759 case KW_oid:
760 thawer.get (this, thawer.get_sint32 ());
761 break;
762
763 case KW_file_format_version: break; // nop
764
765 case KW_name: thawer.get (name); break;
766 case KW_attach: thawer.get (attach); break;
767 case KW_reset_time: thawer.get (reset_time); break;
768 case KW_shopgreed: thawer.get (shopgreed); break;
769 case KW_shopmin: thawer.get (shopmin); break;
770 case KW_shopmax: thawer.get (shopmax); break;
771 case KW_shoprace: thawer.get (shoprace); break;
772 case KW_outdoor: thawer.get (outdoor); break;
773 case KW_temp: thawer.get (temp); break;
774 case KW_pressure: thawer.get (pressure); break;
775 case KW_humid: thawer.get (humid); break;
776 case KW_windspeed: thawer.get (windspeed); break;
777 case KW_winddir: thawer.get (winddir); break;
778 case KW_sky: thawer.get (sky); break;
779
780 case KW_per_player: thawer.get (per_player); break;
781 case KW_per_party: thawer.get (per_party); break;
782
783 case KW_region: default_region = region::find (thawer.get_str ()); break;
784 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
785
786 // old names new names
787 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
788 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
789 case KW_x: case KW_width: thawer.get (width); break;
790 case KW_y: case KW_height: thawer.get (height); break;
791 case KW_weight: case KW_reset_timeout: thawer.get (reset_timeout); break;
792 case KW_value: case KW_swap_time: thawer.get (timeout); break;
793 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
794 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
795 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
796
797 case KW_tile_path_1: thawer.get (tile_path [0]); break;
798 case KW_tile_path_2: thawer.get (tile_path [1]); break;
799 case KW_tile_path_3: thawer.get (tile_path [2]); break;
800 case KW_tile_path_4: thawer.get (tile_path [3]); break;
801
802 case KW_end:
803 return true;
804
805 default:
806 if (!thawer.parse_error ("map", 0))
807 return false;
808 break;
865 } 809 }
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 { 810 }
1083 LOG (llevError, "Got premature eof on map header!\n");
1084 return 1;
1085 }
1086 811
1087 return 0; 812 abort ();
1088} 813}
1089 814
1090/* 815bool
1091 * Opens the file "filename" and reads information about the map 816maptile::_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{ 817{
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); 818 object_thawer thawer (path);
1118 819
1119 if (!thawer) 820 if (!thawer)
1120 return 0; 821 return false;
1121 822
1122 m = get_linked_map (); 823 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} 824}
1232 825
1233/****************************************************************************** 826/******************************************************************************
1234 * This is the start of unique map handling code 827 * This is the start of unique map handling code
1235 *****************************************************************************/ 828 *****************************************************************************/
1236 829
1237/* This goes through map 'm' and removed any unique items on the map. */ 830/* This goes through the maptile and removed any unique items on the map. */
1238static void 831void
1239delete_unique_items (maptile *m) 832maptile::clear_unique_items ()
1240{ 833{
1241 int i, j, unique; 834 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 { 835 {
1247 unique = 0; 836 int unique = 0;
1248 837 for (object *op = spaces [i].bot; op; )
1249 for (op = GET_MAP_OB (m, i, j); op; op = next)
1250 { 838 {
1251 next = op->above; 839 object *above = op->above;
1252 840
1253 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 841 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1254 unique = 1; 842 unique = 1;
1255 843
1256 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 844 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1257 { 845 {
1258 op->destroy_inv (false); 846 op->destroy_inv (false);
1259 op->destroy (); 847 op->destroy ();
1260 } 848 }
1261 }
1262 }
1263}
1264 849
1265 850 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 load_objects (m, thawer, 0);
1295
1296 m->in_memory = MAP_IN_MEMORY;
1297}
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 */
1308
1309int
1310new_save_map (maptile *m, int flag)
1311{
1312 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1313 int i;
1314
1315 if (flag && !*m->path)
1316 {
1317 LOG (llevError, "Tried to save map without path.\n");
1318 return -1;
1319 }
1320
1321 if (flag || (m->unique) || (m->templatemap))
1322 {
1323 if (!m->unique && !m->templatemap)
1324 { /* flag is set */
1325 if (flag == 2)
1326 strcpy (filename, create_overlay_pathname (m->path));
1327 else
1328 strcpy (filename, create_pathname (m->path));
1329 } 851 }
1330 else
1331 strcpy (filename, m->path);
1332
1333 make_path_to_file (filename);
1334 }
1335 else
1336 { 852 }
1337 if (!m->tmpname) 853}
1338 m->tmpname = tempnam (settings.tmpdir, NULL);
1339 854
1340 strcpy (filename, m->tmpname); 855bool
856maptile::_save_header (object_freezer &freezer)
857{
858#define MAP_OUT(k) freezer.put (KW_ ## k, k)
859#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
860
861 MAP_OUT2 (arch, "map");
862
863 if (name) MAP_OUT (name);
864 MAP_OUT (swap_time);
865 MAP_OUT (reset_time);
866 MAP_OUT (reset_timeout);
867 MAP_OUT (fixed_resettime);
868 MAP_OUT (difficulty);
869
870 if (default_region) MAP_OUT2 (region, default_region->name);
871
872 if (shopitems)
1341 } 873 {
874 char shop[MAX_BUF];
875 print_shop_string (this, shop);
876 MAP_OUT2 (shopitems, shop);
877 }
1342 878
1343 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 879 MAP_OUT (shopgreed);
1344 m->in_memory = MAP_SAVING; 880 MAP_OUT (shopmin);
881 MAP_OUT (shopmax);
882 if (shoprace) MAP_OUT (shoprace);
883 MAP_OUT (darkness);
884 MAP_OUT (width);
885 MAP_OUT (height);
886 MAP_OUT (enter_x);
887 MAP_OUT (enter_y);
1345 888
889 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
890 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
891
892 MAP_OUT (outdoor);
893 MAP_OUT (temp);
894 MAP_OUT (pressure);
895 MAP_OUT (humid);
896 MAP_OUT (windspeed);
897 MAP_OUT (winddir);
898 MAP_OUT (sky);
899
900 MAP_OUT (per_player);
901 MAP_OUT (per_party);
902
903 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
904 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
905 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
906 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
907
908 freezer.put (this);
909 freezer.put (KW_end);
910
911 return true;
912}
913
914bool
915maptile::_save_header (const char *path)
916{
1346 object_freezer freezer; 917 object_freezer freezer;
1347 918
1348 /* legacy */ 919 if (!_save_header (freezer))
1349 fprintf (freezer, "arch map\n"); 920 return false;
1350 if (m->name)
1351 fprintf (freezer, "name %s\n", m->name);
1352 if (!flag)
1353 fprintf (freezer, "swap_time %d\n", m->swap_time);
1354 if (m->reset_timeout)
1355 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1356 if (m->fixed_resettime)
1357 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1358 /* we unfortunately have no idea if this is a value the creator set
1359 * or a difficulty value we generated when the map was first loaded
1360 */
1361 if (m->difficulty)
1362 fprintf (freezer, "difficulty %d\n", m->difficulty);
1363 if (m->region)
1364 fprintf (freezer, "region %s\n", m->region->name);
1365 if (m->shopitems)
1366 {
1367 print_shop_string (m, shop);
1368 fprintf (freezer, "shopitems %s\n", shop);
1369 }
1370 if (m->shopgreed)
1371 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1372 if (m->shopmin)
1373 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1374 if (m->shopmax)
1375 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1376 if (m->shoprace)
1377 fprintf (freezer, "shoprace %s\n", m->shoprace);
1378 if (m->darkness)
1379 fprintf (freezer, "darkness %d\n", m->darkness);
1380 if (m->width)
1381 fprintf (freezer, "width %d\n", m->width);
1382 if (m->height)
1383 fprintf (freezer, "height %d\n", m->height);
1384 if (m->enter_x)
1385 fprintf (freezer, "enter_x %d\n", m->enter_x);
1386 if (m->enter_y)
1387 fprintf (freezer, "enter_y %d\n", m->enter_y);
1388 if (m->msg)
1389 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1390 if (m->maplore)
1391 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1392 if (m->unique)
1393 fprintf (freezer, "unique %d\n", m->unique);
1394 if (m->templatemap)
1395 fprintf (freezer, "template %d\n", m->templatemap);
1396 if (m->outdoor)
1397 fprintf (freezer, "outdoor %d\n", m->outdoor);
1398 if (m->temp)
1399 fprintf (freezer, "temp %d\n", m->temp);
1400 if (m->pressure)
1401 fprintf (freezer, "pressure %d\n", m->pressure);
1402 if (m->humid)
1403 fprintf (freezer, "humid %d\n", m->humid);
1404 if (m->windspeed)
1405 fprintf (freezer, "windspeed %d\n", m->windspeed);
1406 if (m->winddir)
1407 fprintf (freezer, "winddir %d\n", m->winddir);
1408 if (m->sky)
1409 fprintf (freezer, "sky %d\n", m->sky);
1410 if (m->nosmooth)
1411 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1412 921
1413 /* Save any tiling information, except on overlays */ 922 return freezer.save (path);
1414 if (flag != 2)
1415 for (i = 0; i < 4; i++)
1416 if (m->tile_path[i])
1417 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1418
1419 freezer.put (m);
1420 fprintf (freezer, "end\n");
1421
1422 /* In the game save unique items in the different file, but
1423 * in the editor save them to the normal map file.
1424 * If unique map, save files in the proper destination (set by
1425 * player)
1426 */
1427 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1428 {
1429 object_freezer unique;
1430
1431 if (flag == 2)
1432 save_objects (m, freezer, unique, 2);
1433 else
1434 save_objects (m, freezer, unique, 0);
1435
1436 sprintf (buf, "%s.v00", create_items_path (m->path));
1437
1438 unique.save (buf);
1439 }
1440 else
1441 { /* save same file when not playing, like in editor */
1442 save_objects (m, freezer, freezer, 0);
1443 }
1444
1445 freezer.save (filename);
1446
1447 return 0;
1448} 923}
1449 924
1450/* 925/*
1451 * Remove and free all objects in the given map. 926 * Remove and free all objects in the given map.
1452 */ 927 */
1453void 928void
1454free_all_objects (maptile *m) 929maptile::clear ()
1455{ 930{
931 sfree (regions, size ()), regions = 0;
932 free (regionmap), regionmap = 0;
933
1456 if (!m->spaces) 934 if (spaces)
1457 return;
1458
1459 for (int i = 0; i < m->width; i++)
1460 for (int j = 0; j < m->height; j++)
1461 { 935 {
1462 mapspace &ms = m->at (i, j); 936 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1463
1464 while (object *op = ms.bot) 937 while (object *op = ms->bot)
1465 { 938 {
1466 if (op->head) 939 if (op->head)
1467 op = op->head; 940 op = op->head;
1468 941
1469 op->destroy_inv (false); 942 op->destroy_inv (false);
1470 op->destroy (); 943 op->destroy ();
1471 } 944 }
945
946 sfree (spaces, size ()), spaces = 0;
1472 } 947 }
1473}
1474 948
1475/* 949 if (buttons)
1476 * Frees everything allocated by the given maptileure. 950 free_objectlinkpt (buttons), buttons = 0;
1477 * don't free tmpname - our caller is left to do that 951}
1478 */ 952
1479void 953void
1480free_map (maptile *m, int flag) 954maptile::clear_header ()
1481{ 955{
1482 if (m->in_memory != MAP_IN_MEMORY) 956 name = 0;
1483 return; 957 msg = 0;
1484 958 maplore = 0;
1485 m->in_memory = MAP_SAVING; 959 shoprace = 0;
1486 960 delete [] shopitems, shopitems = 0;
1487 // TODO: use new/delete
1488#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1489
1490 if (flag && m->spaces)
1491 free_all_objects (m);
1492 if (m->name)
1493 FREE_AND_CLEAR (m->name);
1494 if (m->spaces)
1495 FREE_AND_CLEAR (m->spaces);
1496 if (m->msg)
1497 FREE_AND_CLEAR (m->msg);
1498 if (m->maplore)
1499 FREE_AND_CLEAR (m->maplore);
1500
1501 delete [] m->shopitems;
1502 m->shopitems = 0;
1503
1504 if (m->shoprace)
1505 FREE_AND_CLEAR (m->shoprace);
1506
1507 if (m->buttons)
1508 free_objectlinkpt (m->buttons);
1509
1510 m->buttons = NULL;
1511 961
1512 for (int i = 0; i < 4; i++) 962 for (int i = 0; i < 4; i++)
1513 {
1514 if (m->tile_path[i])
1515 FREE_AND_CLEAR (m->tile_path[i]);
1516
1517 m->tile_map[i] = 0; 963 tile_path [i] = 0;
1518 }
1519
1520 m->in_memory = MAP_SWAPPED;
1521
1522#undef FREE_AND_CLEAR
1523} 964}
1524 965
1525maptile::~maptile () 966maptile::~maptile ()
1526{ 967{
1527 free_map (this, 1); 968 assert (destroyed ());
1528 free (tmpname);
1529} 969}
1530 970
1531void 971void
1532maptile::do_destroy () 972maptile::clear_links_to (maptile *m)
1533{ 973{
1534 attachable::do_destroy ();
1535
1536 free_all_objects (this);
1537
1538 /* We need to look through all the maps and see if any maps 974 /* We need to look through all the maps and see if any maps
1539 * are pointing at this one for tiling information. Since 975 * are pointing at this one for tiling information. Since
1540 * tiling can be asymetric, we just can not look to see which 976 * tiling can be asymetric, we just can not look to see which
1541 * maps this map tiles with and clears those. 977 * maps this map tiles with and clears those.
1542 */ 978 */
1543 //TODO: non-euclidean-tiling MUST GO
1544 for (maptile *m = first_map; m; m = m->next)
1545 for (int i = 0; i < 4; i++) 979 for (int i = 0; i < 4; i++)
1546 if (m->tile_map[i] == this) 980 if (tile_map[i] == m)
1547 m->tile_map[i] = 0; 981 tile_map[i] = 0;
1548
1549 if (first_map == this)
1550 first_map = next;
1551 else
1552 for (maptile *m = first_map; m; m = m->next)
1553 if (m->next = this)
1554 {
1555 m->next = next;
1556 break;
1557 }
1558} 982}
1559 983
1560//TODO: must go
1561void 984void
1562delete_map (maptile *m) 985maptile::do_destroy ()
1563{ 986{
1564 if (m) 987 attachable::do_destroy ();
1565 m->destroy (); 988
989 clear ();
1566} 990}
1567 991
1568/* 992/*
1569 * Makes sure the given map is loaded and swapped in. 993 * Updates every button on the map (by calling update_button() for them).
1570 * name is path name of the map.
1571 * flags meaning:
1572 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1573 * and don't do unique items or the like.
1574 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1575 * dont do any more name translation on it.
1576 * 994 */
1577 * Returns a pointer to the given map. 995void
1578 */ 996maptile::update_buttons ()
1579maptile *
1580ready_map_name (const char *name, int flags)
1581{ 997{
1582 if (!name) 998 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1583 return 0; 999 for (objectlink *ol = obp->link; ol; ol = ol->next)
1584
1585 /* Have we been at this level before? */
1586 maptile *m = has_been_loaded (name);
1587
1588 /* Map is good to go, so just return it */
1589 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1590 return m;
1591
1592 /* unique maps always get loaded from their original location, and never
1593 * a temp location. Likewise, if map_flush is set, or we have never loaded
1594 * this map, load it now. I removed the reset checking from here -
1595 * it seems the probability of a player trying to enter a map that should
1596 * reset but hasn't yet is quite low, and removing that makes this function
1597 * a bit cleaner (and players probably shouldn't rely on exact timing for
1598 * resets in any case - if they really care, they should use the 'maps command.
1599 */
1600 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1601 { 1000 {
1602 /* first visit or time to reset */ 1001 if (!ol->ob)
1603 if (m)
1604 { 1002 {
1605 clean_tmp_map (m); /* Doesn't make much difference */ 1003 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1606 delete_map (m); 1004 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
1005 continue;
1607 } 1006 }
1608 1007
1609 /* create and load a map */ 1008 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1610 if (flags & MAP_PLAYER_UNIQUE)
1611 LOG (llevDebug, "Trying to load map %s.\n", name);
1612 else
1613 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1614
1615 //eval_pv ("$x = Event::time", 1);//D
1616 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1617 return (NULL);
1618 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1619
1620 fix_auto_apply (m); /* Chests which open as default */
1621
1622 /* If a player unique map, no extra unique object file to load.
1623 * if from the editor, likewise.
1624 */
1625 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1626 load_unique_objects (m);
1627
1628 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1629 { 1009 {
1630 m = load_overlay_map (name, m); 1010 update_button (ol->ob);
1631 if (m == NULL) 1011 break;
1632 return NULL;
1633 } 1012 }
1634
1635 if (flags & MAP_PLAYER_UNIQUE)
1636 INVOKE_MAP (SWAPIN, m);
1637
1638 } 1013 }
1639 else
1640 {
1641 /* If in this loop, we found a temporary map, so load it up. */
1642
1643 m = load_temporary_map (m);
1644 if (m == NULL)
1645 return NULL;
1646 load_unique_objects (m);
1647
1648 clean_tmp_map (m);
1649 m->in_memory = MAP_IN_MEMORY;
1650 /* tempnam() on sun systems (probably others) uses malloc
1651 * to allocated space for the string. Free it here.
1652 * In some cases, load_temporary_map above won't find the
1653 * temporary map, and so has reloaded a new map. If that
1654 * is the case, tmpname is now null
1655 */
1656 if (m->tmpname)
1657 free (m->tmpname);
1658 m->tmpname = NULL;
1659 /* It's going to be saved anew anyway */
1660 }
1661
1662 /* Below here is stuff common to both first time loaded maps and
1663 * temp maps.
1664 */
1665
1666 decay_objects (m); /* start the decay */
1667 /* In case other objects press some buttons down */
1668 update_buttons (m);
1669 if (m->outdoor)
1670 set_darkness_map (m);
1671 /* run the weather over this map */
1672 weather_effect (name);
1673 return m;
1674} 1014}
1675
1676 1015
1677/* 1016/*
1678 * This routine is supposed to find out the difficulty of the map. 1017 * This routine is supposed to find out the difficulty of the map.
1679 * difficulty does not have a lot to do with character level, 1018 * difficulty does not have a lot to do with character level,
1680 * but does have a lot to do with treasure on the map. 1019 * but does have a lot to do with treasure on the map.
1682 * Difficulty can now be set by the map creature. If the value stored 1021 * Difficulty can now be set by the map creature. If the value stored
1683 * in the map is zero, then use this routine. Maps should really 1022 * in the map is zero, then use this routine. Maps should really
1684 * have a difficulty set than using this function - human calculation 1023 * have a difficulty set than using this function - human calculation
1685 * is much better than this functions guesswork. 1024 * is much better than this functions guesswork.
1686 */ 1025 */
1687
1688int 1026int
1689calculate_difficulty (maptile *m) 1027maptile::estimate_difficulty () const
1690{ 1028{
1691 object *op;
1692 archetype *at;
1693 int x, y, i;
1694 long monster_cnt = 0; 1029 long monster_cnt = 0;
1695 double avgexp = 0; 1030 double avgexp = 0;
1696 sint64 total_exp = 0; 1031 sint64 total_exp = 0;
1697 1032
1698 if (m->difficulty) 1033 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1699 { 1034 for (object *op = ms->bot; op; op = op->above)
1700 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1701 return m->difficulty;
1702 }
1703
1704 for (x = 0; x < m->width; x++)
1705 for (y = 0; y < m->height; y++)
1706 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1707 { 1035 {
1708 if (QUERY_FLAG (op, FLAG_MONSTER)) 1036 if (QUERY_FLAG (op, FLAG_MONSTER))
1709 { 1037 {
1710 total_exp += op->stats.exp; 1038 total_exp += op->stats.exp;
1711 monster_cnt++; 1039 monster_cnt++;
1712 } 1040 }
1713 1041
1714 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1042 if (QUERY_FLAG (op, FLAG_GENERATOR))
1715 { 1043 {
1716 total_exp += op->stats.exp; 1044 total_exp += op->stats.exp;
1045
1717 at = type_to_archetype (GENERATE_TYPE (op)); 1046 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1718
1719 if (at != NULL)
1720 total_exp += at->clone.stats.exp * 8; 1047 total_exp += at->clone.stats.exp * 8;
1721 1048
1722 monster_cnt++; 1049 monster_cnt++;
1723 } 1050 }
1724 } 1051 }
1725 1052
1726 avgexp = (double) total_exp / monster_cnt; 1053 avgexp = (double) total_exp / monster_cnt;
1727 1054
1728 for (i = 1; i <= settings.max_level; i++) 1055 for (int i = 1; i <= settings.max_level; i++)
1729 {
1730 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp)) 1056 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp))
1731 {
1732 /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1733 return i; 1057 return i;
1734 }
1735 }
1736 1058
1737 return 1; 1059 return 1;
1738}
1739
1740void
1741clean_tmp_map (maptile *m)
1742{
1743 if (m->tmpname == NULL)
1744 return;
1745 INVOKE_MAP (CLEAN, m);
1746 (void) unlink (m->tmpname);
1747}
1748
1749void
1750free_all_maps (void)
1751{
1752 int real_maps = 0;
1753
1754 while (first_map)
1755 {
1756 /* I think some of the callers above before it gets here set this to be
1757 * saving, but we still want to free this data
1758 */
1759 if (first_map->in_memory == MAP_SAVING)
1760 first_map->in_memory = MAP_IN_MEMORY;
1761 delete_map (first_map);
1762 real_maps++;
1763 }
1764 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1765} 1060}
1766 1061
1767/* change_map_light() - used to change map light level (darkness) 1062/* change_map_light() - used to change map light level (darkness)
1768 * up or down. Returns true if successful. It should now be 1063 * up or down. Returns true if successful. It should now be
1769 * possible to change a value by more than 1. 1064 * possible to change a value by more than 1.
1770 * Move this from los.c to map.c since this is more related 1065 * Move this from los.c to map.c since this is more related
1771 * to maps than los. 1066 * to maps than los.
1772 * postive values make it darker, negative make it brighter 1067 * postive values make it darker, negative make it brighter
1773 */ 1068 */
1774
1775int 1069int
1776change_map_light (maptile *m, int change) 1070maptile::change_map_light (int change)
1777{ 1071{
1778 int new_level = m->darkness + change; 1072 int new_level = darkness + change;
1779 1073
1780 /* Nothing to do */ 1074 /* Nothing to do */
1781 if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS)) 1075 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))
1782 {
1783 return 0; 1076 return 0;
1784 }
1785 1077
1786 /* inform all players on the map */ 1078 /* inform all players on the map */
1787 if (change > 0) 1079 if (change > 0)
1788 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); 1080 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1789 else 1081 else
1790 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); 1082 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1791 1083
1792 /* Do extra checking. since m->darkness is a unsigned value, 1084 /* Do extra checking. since darkness is a unsigned value,
1793 * we need to be extra careful about negative values. 1085 * we need to be extra careful about negative values.
1794 * In general, the checks below are only needed if change 1086 * In general, the checks below are only needed if change
1795 * is not +/-1 1087 * is not +/-1
1796 */ 1088 */
1797 if (new_level < 0) 1089 if (new_level < 0)
1798 m->darkness = 0; 1090 darkness = 0;
1799 else if (new_level >= MAX_DARKNESS) 1091 else if (new_level >= MAX_DARKNESS)
1800 m->darkness = MAX_DARKNESS; 1092 darkness = MAX_DARKNESS;
1801 else 1093 else
1802 m->darkness = new_level; 1094 darkness = new_level;
1803 1095
1804 /* All clients need to get re-updated for the change */ 1096 /* All clients need to get re-updated for the change */
1805 update_all_map_los (m); 1097 update_all_map_los (this);
1806 return 1; 1098 return 1;
1807} 1099}
1808 1100
1809/* 1101/*
1810 * This function updates various attributes about a specific space 1102 * This function updates various attributes about a specific space
1814 */ 1106 */
1815void 1107void
1816mapspace::update_ () 1108mapspace::update_ ()
1817{ 1109{
1818 object *tmp, *last = 0; 1110 object *tmp, *last = 0;
1819 uint8 flags = 0, light = 0, anywhere = 0; 1111 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1820 New_Face *top, *floor, *middle; 1112 facetile *top, *floor, *middle;
1821 object *top_obj, *floor_obj, *middle_obj; 1113 object *top_obj, *floor_obj, *middle_obj;
1822 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1114 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1823 1115
1824 middle = blank_face; 1116 middle = blank_face;
1825 top = blank_face; 1117 top = blank_face;
1941 1233
1942 /* If two top faces are already set, quit processing */ 1234 /* If two top faces are already set, quit processing */
1943 if ((top != blank_face) && (middle != blank_face)) 1235 if ((top != blank_face) && (middle != blank_face))
1944 break; 1236 break;
1945 1237
1946 /* Only show visible faces, unless its the editor - show all */ 1238 /* Only show visible faces */
1947 if (!tmp->invisible || editor) 1239 if (!tmp->invisible)
1948 { 1240 {
1949 /* Fill in top if needed */ 1241 /* Fill in top if needed */
1950 if (top == blank_face) 1242 if (top == blank_face)
1951 { 1243 {
1952 top = tmp->face; 1244 top = tmp->face;
1982 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1274 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1983 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1275 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1984 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1276 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1985} 1277}
1986 1278
1987void 1279uint64
1988set_map_reset_time (maptile *map) 1280mapspace::volume () const
1989{ 1281{
1990 int timeout; 1282 uint64 vol = 0;
1991 1283
1992 timeout = map->reset_timeout; 1284 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1993 if (timeout <= 0) 1285 vol += op->volume ();
1994 timeout = MAP_DEFAULTRESET;
1995 if (timeout >= MAP_MAXRESET)
1996 timeout = MAP_MAXRESET;
1997 map->reset_time = time (0) + timeout;
1998}
1999 1286
1287 return vol;
1288}
1289
2000/* this updates the orig_map->tile_map[tile_num] value after loading 1290/* this updates the orig_map->tile_map[tile_num] value after finding
2001 * the map. It also takes care of linking back the freshly loaded 1291 * the map. It also takes care of linking back the freshly found
2002 * maps tile_map values if it tiles back to this one. It returns 1292 * maps tile_map values if it tiles back to this one. It returns
2003 * the value of orig_map->tile_map[tile_num]. It really only does this 1293 * the value of orig_map->tile_map[tile_num].
2004 * so that it is easier for calling functions to verify success.
2005 */ 1294 */
2006
2007static maptile * 1295static inline maptile *
2008load_and_link_tiled_map (maptile *orig_map, int tile_num) 1296find_and_link (maptile *orig_map, int tile_num)
2009{ 1297{
1298 maptile *mp = orig_map->tile_map [tile_num];
1299
1300 if (!mp)
1301 {
1302 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1303
1304 if (!mp)
1305 {
1306 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1307 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1308 &orig_map->tile_path[tile_num], &orig_map->path);
1309 mp = new maptile (1, 1);
1310 mp->alloc ();
1311 mp->in_memory = MAP_IN_MEMORY;
1312 }
1313 }
1314
2010 int dest_tile = (tile_num + 2) % 4; 1315 int dest_tile = (tile_num + 2) % 4;
2011 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
2012 1316
2013 orig_map->tile_map[tile_num] = ready_map_name (path, 0); 1317 orig_map->tile_map [tile_num] = mp;
2014 1318
2015 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1319 // optimisation: back-link map to origin map if euclidean
2016 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)) 1320 //TODO: non-euclidean maps MUST GO
1321 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
2017 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1322 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
2018 1323
2019 return orig_map->tile_map[tile_num]; 1324 return mp;
1325}
1326
1327static inline void
1328load_and_link (maptile *orig_map, int tile_num)
1329{
1330 find_and_link (orig_map, tile_num)->load_sync ();
2020} 1331}
2021 1332
2022/* this returns TRUE if the coordinates (x,y) are out of 1333/* this returns TRUE if the coordinates (x,y) are out of
2023 * map m. This function also takes into account any 1334 * map m. This function also takes into account any
2024 * tiling considerations, loading adjacant maps as needed. 1335 * tiling considerations, loading adjacant maps as needed.
2025 * This is the function should always be used when it 1336 * This is the function should always be used when it
2026 * necessary to check for valid coordinates. 1337 * necessary to check for valid coordinates.
2027 * This function will recursively call itself for the 1338 * This function will recursively call itself for the
2028 * tiled maps. 1339 * tiled maps.
2029 *
2030 *
2031 */ 1340 */
2032int 1341int
2033out_of_map (maptile *m, int x, int y) 1342out_of_map (maptile *m, int x, int y)
2034{ 1343{
2035 /* If we get passed a null map, this is obviously the 1344 /* If we get passed a null map, this is obviously the
2043 { 1352 {
2044 if (!m->tile_path[3]) 1353 if (!m->tile_path[3])
2045 return 1; 1354 return 1;
2046 1355
2047 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1356 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2048 load_and_link_tiled_map (m, 3); 1357 find_and_link (m, 3);
2049 1358
2050 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y)); 1359 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
2051 } 1360 }
2052 1361
2053 if (x >= m->width) 1362 if (x >= m->width)
2054 { 1363 {
2055 if (!m->tile_path[1]) 1364 if (!m->tile_path[1])
2056 return 1; 1365 return 1;
2057 1366
2058 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1367 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2059 load_and_link_tiled_map (m, 1); 1368 find_and_link (m, 1);
2060 1369
2061 return (out_of_map (m->tile_map[1], x - m->width, y)); 1370 return out_of_map (m->tile_map[1], x - m->width, y);
2062 } 1371 }
2063 1372
2064 if (y < 0) 1373 if (y < 0)
2065 { 1374 {
2066 if (!m->tile_path[0]) 1375 if (!m->tile_path[0])
2067 return 1; 1376 return 1;
2068 1377
2069 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1378 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2070 load_and_link_tiled_map (m, 0); 1379 find_and_link (m, 0);
2071 1380
2072 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height)); 1381 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
2073 } 1382 }
2074 1383
2075 if (y >= m->height) 1384 if (y >= m->height)
2076 { 1385 {
2077 if (!m->tile_path[2]) 1386 if (!m->tile_path[2])
2078 return 1; 1387 return 1;
2079 1388
2080 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1389 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2081 load_and_link_tiled_map (m, 2); 1390 find_and_link (m, 2);
2082 1391
2083 return (out_of_map (m->tile_map[2], x, y - m->height)); 1392 return out_of_map (m->tile_map[2], x, y - m->height);
2084 } 1393 }
2085 1394
2086 /* Simple case - coordinates are within this local 1395 /* Simple case - coordinates are within this local
2087 * map. 1396 * map.
2088 */ 1397 */
2091 1400
2092/* This is basically the same as out_of_map above, but 1401/* This is basically the same as out_of_map above, but
2093 * instead we return NULL if no map is valid (coordinates 1402 * instead we return NULL if no map is valid (coordinates
2094 * out of bounds and no tiled map), otherwise it returns 1403 * out of bounds and no tiled map), otherwise it returns
2095 * the map as that the coordinates are really on, and 1404 * the map as that the coordinates are really on, and
2096 * updates x and y to be the localized coordinates. 1405 * updates x and y to be the localised coordinates.
2097 * Using this is more efficient of calling out_of_map 1406 * Using this is more efficient of calling out_of_map
2098 * and then figuring out what the real map is 1407 * and then figuring out what the real map is
2099 */ 1408 */
2100maptile * 1409maptile *
2101get_map_from_coord (maptile *m, sint16 * x, sint16 * y) 1410maptile::xy_find (sint16 &x, sint16 &y)
2102{ 1411{
2103
2104 if (*x < 0) 1412 if (x < 0)
2105 { 1413 {
2106 if (!m->tile_path[3]) 1414 if (!tile_path[3])
2107 return 0; 1415 return 0;
2108 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2109 load_and_link_tiled_map (m, 3);
2110 1416
1417 find_and_link (this, 3);
2111 *x += m->tile_map[3]->width; 1418 x += tile_map[3]->width;
2112 return (get_map_from_coord (m->tile_map[3], x, y)); 1419 return tile_map[3]->xy_find (x, y);
2113 } 1420 }
2114 1421
2115 if (*x >= m->width) 1422 if (x >= width)
2116 { 1423 {
2117 if (!m->tile_path[1]) 1424 if (!tile_path[1])
2118 return 0; 1425 return 0;
2119 1426
2120 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1427 find_and_link (this, 1);
2121 load_and_link_tiled_map (m, 1);
2122
2123 *x -= m->width; 1428 x -= width;
2124 return (get_map_from_coord (m->tile_map[1], x, y)); 1429 return tile_map[1]->xy_find (x, y);
2125 } 1430 }
2126 1431
2127 if (*y < 0) 1432 if (y < 0)
2128 { 1433 {
2129 if (!m->tile_path[0]) 1434 if (!tile_path[0])
2130 return 0; 1435 return 0;
2131 1436
2132 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1437 find_and_link (this, 0);
2133 load_and_link_tiled_map (m, 0);
2134
2135 *y += m->tile_map[0]->height; 1438 y += tile_map[0]->height;
2136 return (get_map_from_coord (m->tile_map[0], x, y)); 1439 return tile_map[0]->xy_find (x, y);
2137 } 1440 }
2138 1441
2139 if (*y >= m->height) 1442 if (y >= height)
2140 { 1443 {
2141 if (!m->tile_path[2]) 1444 if (!tile_path[2])
2142 return 0; 1445 return 0;
2143 1446
2144 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1447 find_and_link (this, 2);
2145 load_and_link_tiled_map (m, 2);
2146
2147 *y -= m->height; 1448 y -= height;
2148 return (get_map_from_coord (m->tile_map[2], x, y)); 1449 return tile_map[2]->xy_find (x, y);
2149 } 1450 }
2150 1451
2151 /* Simple case - coordinates are within this local 1452 /* Simple case - coordinates are within this local
2152 * map. 1453 * map.
2153 */ 1454 */
2154
2155 return m; 1455 return this;
2156} 1456}
2157 1457
2158/** 1458/**
2159 * Return whether map2 is adjacent to map1. If so, store the distance from 1459 * Return whether map2 is adjacent to map1. If so, store the distance from
2160 * map1 to map2 in dx/dy. 1460 * map1 to map2 in dx/dy.
2161 */ 1461 */
2162static int 1462int
2163adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1463adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
2164{ 1464{
2165 if (!map1 || !map2) 1465 if (!map1 || !map2)
2166 return 0; 1466 return 0;
2167 1467
1468 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1469 //fix: compare paths instead (this is likely faster, too!)
2168 if (map1 == map2) 1470 if (map1 == map2)
2169 { 1471 {
2170 *dx = 0; 1472 *dx = 0;
2171 *dy = 0; 1473 *dy = 0;
2172
2173 } 1474 }
2174 else if (map1->tile_map[0] == map2) 1475 else if (map1->tile_map[0] == map2)
2175 { /* up */ 1476 { /* up */
2176 *dx = 0; 1477 *dx = 0;
2177 *dy = -map2->height; 1478 *dy = -map2->height;
2188 } 1489 }
2189 else if (map1->tile_map[3] == map2) 1490 else if (map1->tile_map[3] == map2)
2190 { /* left */ 1491 { /* left */
2191 *dx = -map2->width; 1492 *dx = -map2->width;
2192 *dy = 0; 1493 *dy = 0;
2193
2194 } 1494 }
2195 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1495 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2196 { /* up right */ 1496 { /* up right */
2197 *dx = map1->tile_map[0]->width; 1497 *dx = map1->tile_map[0]->width;
2198 *dy = -map1->tile_map[0]->height; 1498 *dy = -map1->tile_map[0]->height;
2229 } 1529 }
2230 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1530 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2231 { /* left down */ 1531 { /* left down */
2232 *dx = -map1->tile_map[3]->width; 1532 *dx = -map1->tile_map[3]->width;
2233 *dy = map1->tile_map[3]->height; 1533 *dy = map1->tile_map[3]->height;
2234
2235 } 1534 }
2236 else 1535 else
2237 { /* not "adjacent" enough */
2238 return 0; 1536 return 0;
2239 }
2240 1537
2241 return 1; 1538 return 1;
1539}
1540
1541maptile *
1542maptile::xy_load (sint16 &x, sint16 &y)
1543{
1544 maptile *map = xy_find (x, y);
1545
1546 if (map)
1547 map->load_sync ();
1548
1549 return map;
1550}
1551
1552maptile *
1553get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1554{
1555 return m->xy_load (*x, *y);
2242} 1556}
2243 1557
2244/* From map.c 1558/* From map.c
2245 * This is used by get_player to determine where the other 1559 * This is used by get_player to determine where the other
2246 * creature is. get_rangevector takes into account map tiling, 1560 * creature is. get_rangevector takes into account map tiling,
2247 * so you just can not look the the map coordinates and get the 1561 * so you just can not look the the map coordinates and get the
2248 * righte value. distance_x/y are distance away, which 1562 * righte value. distance_x/y are distance away, which
2249 * can be negativbe. direction is the crossfire direction scheme 1563 * can be negative. direction is the crossfire direction scheme
2250 * that the creature should head. part is the part of the 1564 * that the creature should head. part is the part of the
2251 * monster that is closest. 1565 * monster that is closest.
2252 * 1566 *
2253 * get_rangevector looks at op1 and op2, and fills in the 1567 * get_rangevector looks at op1 and op2, and fills in the
2254 * structure for op1 to get to op2. 1568 * structure for op1 to get to op2.
2259 * be unexpected 1573 * be unexpected
2260 * 1574 *
2261 * currently, the only flag supported (0x1) is don't translate for 1575 * currently, the only flag supported (0x1) is don't translate for
2262 * closest body part of 'op1' 1576 * closest body part of 'op1'
2263 */ 1577 */
2264
2265void 1578void
2266get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1579get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2267{ 1580{
2268 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1581 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2269 { 1582 {
2270 /* be conservative and fill in _some_ data */ 1583 /* be conservative and fill in _some_ data */
2271 retval->distance = 100000; 1584 retval->distance = 10000;
2272 retval->distance_x = 32767; 1585 retval->distance_x = 10000;
2273 retval->distance_y = 32767; 1586 retval->distance_y = 10000;
2274 retval->direction = 0; 1587 retval->direction = 0;
2275 retval->part = 0; 1588 retval->part = 0;
2276 } 1589 }
2277 else 1590 else
2278 { 1591 {
2283 1596
2284 best = op1; 1597 best = op1;
2285 /* If this is multipart, find the closest part now */ 1598 /* If this is multipart, find the closest part now */
2286 if (!(flags & 0x1) && op1->more) 1599 if (!(flags & 0x1) && op1->more)
2287 { 1600 {
2288 object *tmp;
2289 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1601 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
2290 1602
2291 /* we just take the offset of the piece to head to figure 1603 /* we just take the offset of the piece to head to figure
2292 * distance instead of doing all that work above again 1604 * distance instead of doing all that work above again
2293 * since the distance fields we set above are positive in the 1605 * since the distance fields we set above are positive in the
2294 * same axis as is used for multipart objects, the simply arithmetic 1606 * same axis as is used for multipart objects, the simply arithmetic
2295 * below works. 1607 * below works.
2296 */ 1608 */
2297 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1609 for (object *tmp = op1->more; tmp; tmp = tmp->more)
2298 { 1610 {
2299 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1611 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
2300 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1612 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
2301 if (tmpi < best_distance) 1613 if (tmpi < best_distance)
2302 { 1614 {
2303 best_distance = tmpi; 1615 best_distance = tmpi;
2304 best = tmp; 1616 best = tmp;
2305 } 1617 }
2306 } 1618 }
1619
2307 if (best != op1) 1620 if (best != op1)
2308 { 1621 {
2309 retval->distance_x += op1->x - best->x; 1622 retval->distance_x += op1->x - best->x;
2310 retval->distance_y += op1->y - best->y; 1623 retval->distance_y += op1->y - best->y;
2311 } 1624 }
2312 } 1625 }
1626
2313 retval->part = best; 1627 retval->part = best;
2314 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1628 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
2315 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1629 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2316 } 1630 }
2317} 1631}
2318 1632
2319/* this is basically the same as get_rangevector above, but instead of 1633/* this is basically the same as get_rangevector above, but instead of
2324 * flags has no meaning for this function at this time - I kept it in to 1638 * flags has no meaning for this function at this time - I kept it in to
2325 * be more consistant with the above function and also in case they are needed 1639 * be more consistant with the above function and also in case they are needed
2326 * for something in the future. Also, since no object is pasted, the best 1640 * for something in the future. Also, since no object is pasted, the best
2327 * field of the rv_vector is set to NULL. 1641 * field of the rv_vector is set to NULL.
2328 */ 1642 */
2329
2330void 1643void
2331get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1644get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
2332{ 1645{
2333 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1646 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
2334 { 1647 {
2335 /* be conservative and fill in _some_ data */ 1648 /* be conservative and fill in _some_ data */
2336 retval->distance = 100000; 1649 retval->distance = 100000;
2343 { 1656 {
2344 retval->distance_x += op2->x - x; 1657 retval->distance_x += op2->x - x;
2345 retval->distance_y += op2->y - y; 1658 retval->distance_y += op2->y - y;
2346 1659
2347 retval->part = NULL; 1660 retval->part = NULL;
2348 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1661 retval->distance = idistance (retval->distance_x, retval->distance_y);
2349 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1662 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2350 } 1663 }
2351} 1664}
2352 1665
2353/* Returns true of op1 and op2 are effectively on the same map 1666/* Returns true of op1 and op2 are effectively on the same map
2354 * (as related to map tiling). Note that this looks for a path from 1667 * (as related to map tiling). Note that this looks for a path from
2355 * op1 to op2, so if the tiled maps are assymetric and op2 has a path 1668 * op1 to op2, so if the tiled maps are asymetric and op2 has a path
2356 * to op1, this will still return false. 1669 * to op1, this will still return false.
2357 * Note we only look one map out to keep the processing simple 1670 * Note we only look one map out to keep the processing simple
2358 * and efficient. This could probably be a macro. 1671 * and efficient. This could probably be a macro.
2359 * MSW 2001-08-05 1672 * MSW 2001-08-05
2360 */ 1673 */
2363{ 1676{
2364 int dx, dy; 1677 int dx, dy;
2365 1678
2366 return adjacent_map (op1->map, op2->map, &dx, &dy); 1679 return adjacent_map (op1->map, op2->map, &dx, &dy);
2367} 1680}
1681
1682object *
1683maptile::insert (object *op, int x, int y, object *originator, int flags)
1684{
1685 if (!op->flag [FLAG_REMOVED])
1686 op->remove ();
1687
1688 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1689}
1690
1691region *
1692maptile::region (int x, int y) const
1693{
1694 if (regions
1695 && regionmap
1696 && !OUT_OF_REAL_MAP (this, x, y))
1697 if (struct region *reg = regionmap [regions [y * width + x]])
1698 return reg;
1699
1700 if (default_region)
1701 return default_region;
1702
1703 return ::region::default_region ();
1704}
1705
1706

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines