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.33 by root, Sun Oct 8 16:51:50 2006 UTC vs.
Revision 1.109 by root, Thu Jun 7 19:12:22 2007 UTC

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

Diff Legend

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