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