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.44 by root, Mon Dec 18 04:07:30 2006 UTC vs.
Revision 1.102 by root, Thu May 17 21:32:08 2007 UTC

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

Diff Legend

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