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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines