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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines