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.29 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.111 by elmex, Thu Jul 12 18:28:09 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines