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.31 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.205 by root, Wed May 4 07:41:13 2011 UTC

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

Diff Legend

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