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.34 by root, Sun Dec 3 02:04:57 2006 UTC vs.
Revision 1.71 by pippijn, Sat Jan 6 14:42:29 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines