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.41 by root, Tue Dec 12 22:37:05 2006 UTC vs.
Revision 1.109 by root, Thu Jun 7 19:12:22 2007 UTC

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

Diff Legend

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