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.56 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.178 by root, Sun Nov 29 09:41:27 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * 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#include <global.h>
25#include <funcpoint.h>
26
27#include <loader.h>
28#include <unistd.h> 25#include <unistd.h>
29 26
27#include "global.h"
28#include "loader.h"
30#include "path.h" 29#include "path.h"
31 30
32/* 31//+GPL
33 * This makes a path absolute outside the world of Crossfire.
34 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
35 * and returns the pointer to a static array containing the result.
36 * it really should be called create_mapname
37 */
38const char *
39create_pathname (const char *name)
40{
41 static char buf[MAX_BUF];
42 32
43 /* Why? having extra / doesn't confuse unix anyplace? Dependancies 33sint8 maptile::outdoor_darkness;
44 * someplace else in the code? msw 2-17-97
45 */
46 if (*name == '/')
47 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
48 else
49 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name);
50 return (buf);
51}
52
53/*
54 * same as create_pathname, but for the overlay maps.
55 */
56const char *
57create_overlay_pathname (const char *name)
58{
59 static char buf[MAX_BUF];
60
61 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
62 * someplace else in the code? msw 2-17-97
63 */
64 if (*name == '/')
65 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
66 else
67 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
68 return (buf);
69}
70
71/*
72 * same as create_pathname, but for the template maps.
73 */
74const char *
75create_template_pathname (const char *name)
76{
77 static char buf[MAX_BUF];
78
79 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
80 * someplace else in the code? msw 2-17-97
81 */
82 if (*name == '/')
83 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
84 else
85 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
86 return (buf);
87}
88
89/*
90 * This makes absolute path to the itemfile where unique objects
91 * will be saved. Converts '/' to '@'. I think it's essier maintain
92 * files than full directory structure, but if this is problem it can
93 * be changed.
94 */
95static const char *
96create_items_path (const char *s)
97{
98 static char buf[MAX_BUF];
99 char *t;
100
101 if (*s == '/')
102 s++;
103
104 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
105
106 for (t = buf + strlen (buf); *s; s++, t++)
107 if (*s == '/')
108 *t = '@';
109 else
110 *t = *s;
111 *t = 0;
112 return (buf);
113}
114
115/*
116 * This function checks if a file with the given path exists.
117 * -1 is returned if it fails, otherwise the mode of the file
118 * is returned.
119 * It tries out all the compression suffixes listed in the uncomp[] array.
120 *
121 * If prepend_dir is set, then we call create_pathname (which prepends
122 * libdir & mapdir). Otherwise, we assume the name given is fully
123 * complete.
124 * Only the editor actually cares about the writablity of this -
125 * the rest of the code only cares that the file is readable.
126 * when the editor goes away, the call to stat should probably be
127 * replaced by an access instead (similar to the windows one, but
128 * that seems to be missing the prepend_dir processing
129 */
130int
131check_path (const char *name, int prepend_dir)
132{
133 char buf[MAX_BUF];
134
135 char *endbuf;
136 struct stat statbuf;
137 int mode = 0;
138
139 if (prepend_dir)
140 strcpy (buf, create_pathname (name));
141 else
142 strcpy (buf, name);
143
144 /* old method (strchr(buf, '\0')) seemd very odd to me -
145 * this method should be equivalant and is clearer.
146 * Can not use strcat because we need to cycle through
147 * all the names.
148 */
149 endbuf = buf + strlen (buf);
150
151 if (stat (buf, &statbuf))
152 return -1;
153 if (!S_ISREG (statbuf.st_mode))
154 return (-1);
155
156 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
157 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
158 mode |= 4;
159
160 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
161 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
162 mode |= 2;
163
164 return (mode);
165}
166 34
167/* This rolls up wall, blocks_magic, blocks_view, etc, all into 35/* This rolls up wall, blocks_magic, blocks_view, etc, all into
168 * one function that just returns a P_.. value (see map.h) 36 * one function that just returns a P_.. value (see map.h)
169 * it will also do map translation for tiled maps, returning 37 * it will also do map translation for tiled maps, returning
170 * new values into newmap, nx, and ny. Any and all of those 38 * new values into newmap, nx, and ny. Any and all of those
205 * by the caller. 73 * by the caller.
206 */ 74 */
207int 75int
208blocked_link (object *ob, maptile *m, int sx, int sy) 76blocked_link (object *ob, maptile *m, int sx, int sy)
209{ 77{
210 object *tmp;
211 int mflags, blocked;
212
213 /* Make sure the coordinates are valid - they should be, as caller should 78 /* Make sure the coordinates are valid - they should be, as caller should
214 * have already checked this. 79 * have already checked this.
215 */ 80 */
216 if (OUT_OF_REAL_MAP (m, sx, sy)) 81 if (OUT_OF_REAL_MAP (m, sx, sy))
217 { 82 {
218 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 83 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
219 return 1; 84 return 1;
220 } 85 }
221 86
222 /* Save some cycles - instead of calling get_map_flags(), just get the value 87 mapspace &ms = m->at (sx, sy);
223 * directly.
224 */
225 mflags = m->at (sx, sy).flags ();
226 88
227 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 89 int mflags = ms.flags ();
90 int blocked = ms.move_block;
228 91
229 /* If space is currently not blocked by anything, no need to 92 /* If space is currently not blocked by anything, no need to
230 * go further. Not true for players - all sorts of special 93 * go further. Not true for players - all sorts of special
231 * things we need to do for players. 94 * things we need to do for players.
232 */ 95 */
233 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
234 return 0; 97 return 0;
235 98
236 /* if there isn't anytyhing alive on this space, and this space isn't 99 /* if there isn't anything alive on this space, and this space isn't
237 * otherwise blocked, we can return now. Only if there is a living 100 * otherwise blocked, we can return now. Only if there is a living
238 * creature do we need to investigate if it is part of this creature 101 * creature do we need to investigate if it is part of this creature
239 * or another. Likewise, only if something is blocking us do we 102 * or another. Likewise, only if something is blocking us do we
240 * need to investigate if there is a special circumstance that would 103 * need to investigate if there is a special circumstance that would
241 * let the player through (inventory checkers for example) 104 * let the player through (inventory checkers for example)
242 */ 105 */
243 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 106 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
244 return 0; 107 return 0;
245 108
246 if (ob->head != NULL)
247 ob = ob->head; 109 ob = ob->head_ ();
248 110
249 /* We basically go through the stack of objects, and if there is 111 /* We basically go through the stack of objects, and if there is
250 * some other object that has NO_PASS or FLAG_ALIVE set, return 112 * some other object that has NO_PASS or FLAG_ALIVE set, return
251 * true. If we get through the entire stack, that must mean 113 * true. If we get through the entire stack, that must mean
252 * ob is blocking it, so return 0. 114 * ob is blocking it, so return 0.
253 */ 115 */
254 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 116 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
255 { 117 {
256 118 if (OB_MOVE_BLOCK (ob, tmp))
257 /* This must be before the checks below. Code for inventory checkers. */
258 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
259 { 119 {
260 /* If last_sp is set, the player/monster needs an object, 120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
261 * so we check for it. If they don't have it, they can't 121 if (RESULT_INT (0))
262 * pass through this space. 122 return 1;
263 */ 123 else
264 if (tmp->last_sp) 124 continue;
125
126 if (tmp->type == CHECK_INV)
265 { 127 {
266 if (check_inv_recursive (ob, tmp) == NULL) 128 bool have = check_inv_recursive (ob, tmp);
129
130 // last_sp set means we block if we don't have.
131 if (logical_xor (have, tmp->last_sp))
267 return 1; 132 return 1;
268 else 133 }
269 continue; 134 else if (tmp->type == T_MATCH)
135 {
136 // T_MATCH allows "entrance" iff the match is true
137 // == blocks if the match fails
138
139 // we could have used an INVOKE_OBJECT, but decided against it, as we
140 // assume that T_MATCH is relatively common.
141 if (!match (tmp->slaying, ob, tmp, ob))
142 return 1;
270 } 143 }
271 else 144 else
272 { 145 return 1; // unconditional block
273 /* In this case, the player must not have the object - 146
274 * if they do, they can't pass through.
275 */
276 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
277 return 1;
278 else
279 continue;
280 }
281 } /* if check_inv */
282 else 147 } else {
283 { 148 // space does not block the ob, directly, but
284 /* Broke apart a big nasty if into several here to make 149 // anything alive that is not a door still
285 * this more readable. first check - if the space blocks 150 // blocks anything but wizards.
286 * movement, can't move here. 151
287 * second - if a monster, can't move there, unles it is a 152 if (tmp->flag [FLAG_ALIVE]
288 * hidden dm 153 && tmp->head_ () != ob
289 */ 154 && tmp != ob
290 if (OB_MOVE_BLOCK (ob, tmp)) 155 && tmp->type != DOOR
291 return 1; 156 && !tmp->flag [FLAG_WIZPASS])
292 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
293 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))
294 return 1; 157 return 1;
295 } 158 }
296
297 } 159 }
160
298 return 0; 161 return 0;
299} 162}
300 163
301
302/* 164/*
303 * Returns true if the given object can't fit in the given spot. 165 * Returns qthe blocking object if the given object can't fit in the given
304 * This is meant for multi space objects - for single space objecs, 166 * spot. This is meant for multi space objects - for single space objecs,
305 * just calling get_map_blocked and checking that against movement type 167 * just calling get_map_blocked and checking that against movement type
306 * of object. This function goes through all the parts of the 168 * of object. This function goes through all the parts of the multipart
307 * multipart object and makes sure they can be inserted. 169 * object and makes sure they can be inserted.
308 * 170 *
309 * While this doesn't call out of map, the get_map_flags does. 171 * While this doesn't call out of map, the get_map_flags does.
310 * 172 *
311 * This function has been used to deprecate arch_out_of_map - 173 * This function has been used to deprecate arch_out_of_map -
312 * this function also does that check, and since in most cases, 174 * this function also does that check, and since in most cases,
323 * 185 *
324 * Note this used to be arch_blocked, but with new movement 186 * Note this used to be arch_blocked, but with new movement
325 * code, we need to have actual object to check its move_type 187 * code, we need to have actual object to check its move_type
326 * against the move_block values. 188 * against the move_block values.
327 */ 189 */
328int 190bool
329ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 191object::blocked (maptile *m, int x, int y) const
330{ 192{
331 archetype *tmp; 193 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
332 int flag;
333 maptile *m1;
334 sint16 sx, sy;
335
336 if (ob == NULL)
337 {
338 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
339 if (flag & P_OUT_OF_MAP)
340 return P_OUT_OF_MAP;
341
342 /* don't have object, so don't know what types would block */
343 return m1->at (sx, sy).move_block;
344 } 194 {
195 mapxy pos (m, x + tmp->x, y + tmp->y);
345 196
346 for (tmp = ob->arch; tmp; tmp = tmp->more) 197 if (!pos.normalise ())
347 { 198 return 1;
348 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
349 199
350 if (flag & P_OUT_OF_MAP) 200 mapspace &ms = *pos;
351 return P_OUT_OF_MAP; 201
352 if (flag & P_IS_ALIVE) 202 if (ms.flags () & P_IS_ALIVE)
353 return P_IS_ALIVE; 203 return 1;
354 204
355 mapspace &ms = m1->at (sx, sy); 205 /* However, often ob doesn't have any move type
356 206 * (signifying non-moving objects)
357 /* find_first_free_spot() calls this function. However, often
358 * ob doesn't have any move type (when used to place exits)
359 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 207 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
360 */ 208 */
361
362 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 209 if (!move_type && ms.move_block != MOVE_ALL)
363 continue; 210 continue;
364 211
365 /* Note it is intentional that we check ob - the movement type of the 212 /* Note it is intentional that we check ob - the movement type of the
366 * head of the object should correspond for the entire object. 213 * head of the object should correspond for the entire object.
367 */ 214 */
368 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 215 if (ms.blocks (move_type))
369 return P_NO_PASS; 216 return 1;
370 } 217 }
371 218
372 return 0; 219 return 0;
373} 220}
374 221
375/* When the map is loaded, load_object does not actually insert objects 222//-GPL
376 * into inventory, but just links them. What this does is go through
377 * and insert them properly.
378 * The object 'container' is the object that contains the inventory.
379 * This is needed so that we can update the containers weight.
380 */
381void
382fix_container (object *container)
383{
384 object *tmp = container->inv, *next;
385 223
386 container->inv = 0; 224void
387 while (tmp) 225maptile::set_object_flag (int flag, int value)
388 { 226{
389 next = tmp->below; 227 if (!spaces)
390 if (tmp->inv) 228 return;
391 fix_container (tmp);
392 229
393 insert_ob_in_ob (tmp, container); 230 for (mapspace *ms = spaces + size (); ms-- > spaces; )
394 tmp = next; 231 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
395 } 232 tmp->flag [flag] = value;
396
397 /* sum_weight will go through and calculate what all the containers are
398 * carrying.
399 */
400 sum_weight (container);
401} 233}
234
235void
236maptile::post_load_original ()
237{
238 if (!spaces)
239 return;
240
241 set_object_flag (FLAG_OBJ_ORIGINAL);
242
243 for (mapspace *ms = spaces + size (); ms-- > spaces; )
244 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
245 INVOKE_OBJECT (RESET, tmp);
246}
247
248void
249maptile::post_load ()
250{
251#if 0
252 if (!spaces)
253 return;
254
255 for (mapspace *ms = spaces + size (); ms-- > spaces; )
256 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
257 ; // nop
258#endif
259}
260
261//+GPL
402 262
403/* link_multipart_objects go through all the objects on the map looking 263/* link_multipart_objects go through all the objects on the map looking
404 * for objects whose arch says they are multipart yet according to the 264 * for objects whose arch says they are multipart yet according to the
405 * info we have, they only have the head (as would be expected when 265 * info we have, they only have the head (as would be expected when
406 * they are saved). We do have to look for the old maps that did save 266 * they are saved).
407 * the more sections and not re-add sections for them.
408 */ 267 */
409void 268void
410maptile::link_multipart_objects () 269maptile::link_multipart_objects ()
411{ 270{
412 if (!spaces) 271 if (!spaces)
413 return; 272 return;
414 273
415 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 274 for (mapspace *ms = spaces + size (); ms-- > spaces; )
416 for (object *tmp = ms->bot; tmp; ) 275 {
276 object *op = ms->bot;
277 while (op)
417 { 278 {
418 object *above = tmp->above;
419
420 /* already multipart - don't do anything more */ 279 /* already multipart - don't do anything more */
421 if (!tmp->head && !tmp->more) 280 if (op->head_ () == op && !op->more && op->arch->more)
422 {
423 /* If there is nothing more to this object, this for loop
424 * won't do anything.
425 */
426 archetype *at;
427 object *last, *op;
428 for (at = tmp->arch->more, last = tmp;
429 at;
430 at = at->more, last = op)
431 { 281 {
432 op = arch_to_object (at); 282 op->remove ();
283 op->expand_tail ();
433 284
434 /* update x,y coordinates */ 285 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
435 op->x += tmp->x; 286 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
436 op->y += tmp->y; 287 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
437 op->head = tmp;
438 op->map = this;
439 last->more = op;
440 op->name = tmp->name;
441 op->title = tmp->title;
442
443 /* we could link all the parts onto tmp, and then just
444 * call insert_ob_in_map once, but the effect is the same,
445 * as insert_ob_in_map will call itself with each part, and
446 * the coding is simpler to just to it here with each part.
447 */
448 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 288 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
289
290 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
291 // so we have to reset the iteration through the mapspace
449 } 292 }
293 else
294 op = op->above;
450 } 295 }
451
452 tmp = above;
453 } 296 }
454} 297}
298
299//-GPL
455 300
456/* 301/*
457 * Loads (ands parses) the objects into a given map from the specified 302 * Loads (ands parses) the objects into a given map from the specified
458 * file pointer. 303 * file pointer.
459 * mapflags is the same as we get with load_original_map
460 */ 304 */
461bool 305bool
462maptile::load_objects (object_thawer &thawer) 306maptile::_load_objects (object_thawer &f)
463{ 307{
464 int unique; 308 for (;;)
465 object *op, *prev = NULL, *last_more = NULL, *otmp;
466
467 op = object::create ();
468 op->map = this; /* To handle buttons correctly */
469
470 while (int i = load_object (thawer, op, 0))
471 { 309 {
472 /* if the archetype for the object is null, means that we 310 coroapi::cede_to_tick (); // cede once in a while
473 * got an invalid object. Don't do anything with it - the game 311
474 * or editor will not be able to do anything with it either. 312 switch (f.kw)
475 */
476 if (op->arch == NULL)
477 { 313 {
478 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 314 case KW_arch:
315 if (object *op = object::read (f, this))
316 {
317 // TODO: why?
318 if (op->inv)
319 op->update_weight ();
320
321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
322 {
323 // we insert manually because
324 // a) its way faster
325 // b) we remove manually, too, and there are good reasons for that
326 // c) it's correct
327 mapspace &ms = at (op->x, op->y);
328
329 op->flag [FLAG_REMOVED] = false;
330
331 op->above = 0;
332 op->below = ms.top;
333
334 *(ms.top ? &ms.top->above : &ms.bot) = op;
335
336 ms.top = op;
337 ms.flags_ = 0;
338 }
339 else
340 {
341 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
342 op->destroy ();
343 }
344 }
345
479 continue; 346 continue;
480 }
481 347
482 switch (i)
483 {
484 case LL_NORMAL:
485 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
486
487 if (op->inv)
488 sum_weight (op);
489
490 prev = op, last_more = op;
491 break;
492
493 case LL_MORE: 348 case KW_EOF:
494 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 349 return true;
495 op->head = prev, last_more->more = op, last_more = op; 350
351 default:
352 if (!f.parse_error ("map file"))
353 return false;
496 break; 354 break;
497 } 355 }
498 356
499 op = object::create (); 357 f.next ();
500 op->map = this;
501 }
502
503 op->destroy ();
504
505#if 0
506 for (i = 0; i < width; i++)
507 for (j = 0; j < height; j++)
508 {
509 unique = 0;
510 /* check for unique items, or unique squares */
511 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
512 {
513 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
514 unique = 1;
515
516 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
517 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
518 }
519 } 358 }
520#endif
521 359
522 return true; 360 return true;
523} 361}
524 362
525void 363void
526maptile::activate () 364maptile::activate ()
527{ 365{
528 if (!spaces) 366 if (spaces)
529 return;
530
531 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 367 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above) 368 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1); 369 op->activate_recursive ();
534} 370}
535 371
536void 372void
537maptile::deactivate () 373maptile::deactivate ()
538{ 374{
539 if (!spaces) 375 if (spaces)
540 return;
541
542 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 376 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above) 377 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1); 378 op->deactivate_recursive ();
545} 379}
546 380
547bool 381bool
548maptile::save_objects (object_freezer &freezer, int flags) 382maptile::_save_objects (object_freezer &f, int flags)
549{ 383{
384 coroapi::cede_to_tick ();
385
550 if (flags & IO_HEADER) 386 if (flags & IO_HEADER)
551 save_header (freezer); 387 _save_header (f);
552 388
553 if (!spaces) 389 if (!spaces)
554 return false; 390 return false;
555 391
556 for (int i = 0; i < size (); ++i) 392 for (int i = 0; i < size (); ++i)
557 { 393 {
558 int unique = 0; 394 bool unique = 0;
395
559 for (object *op = spaces [i].bot; op; op = op->above) 396 for (object *op = spaces [i].bot; op; op = op->above)
560 { 397 {
561 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 398 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
562 unique = 1;
563 399
564 if (!op->can_map_save ()) 400 if (expect_false (!op->can_map_save ()))
565 continue; 401 continue;
566 402
567 if (unique || op->flag [FLAG_UNIQUE]) 403 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
568 { 404 {
569 if (flags & IO_UNIQUES) 405 if (flags & IO_UNIQUES)
570 save_object (freezer, op, 1); 406 op->write (f);
571 } 407 }
572 else if (flags & IO_OBJECTS) 408 else if (expect_true (flags & IO_OBJECTS))
573 save_object (freezer, op, 1); 409 op->write (f);
574 } 410 }
575 } 411 }
576 412
413 coroapi::cede_to_tick ();
414
577 return true; 415 return true;
578} 416}
579 417
580bool 418bool
581maptile::load_objects (const char *path, bool skip_header) 419maptile::_save_objects (const char *path, int flags)
582{ 420{
583 object_thawer thawer (path); 421 object_freezer freezer;
584 422
585 if (!thawer) 423 if (!_save_objects (freezer, flags))
586 return false; 424 return false;
587 425
588 if (skip_header)
589 for (;;)
590 {
591 keyword kw = thawer.get_kv ();
592
593 if (kw == KW_end)
594 break;
595
596 thawer.skip_kv (kw);
597 }
598
599 return load_objects (thawer);
600}
601
602bool
603maptile::save_objects (const char *path, int flags)
604{
605 object_freezer freezer;
606
607 if (!save_objects (freezer, flags))
608 return false;
609
610 return freezer.save (path); 426 return freezer.save (path);
611} 427}
612 428
613maptile::maptile () 429maptile::maptile ()
614{ 430{
615 in_memory = MAP_SWAPPED; 431 in_memory = MAP_SWAPPED;
616 432
617 /* The maps used to pick up default x and y values from the 433 /* The maps used to pick up default x and y values from the
618 * map archetype. Mimic that behaviour. 434 * map archetype. Mimic that behaviour.
619 */ 435 */
620 width = 16; 436 width = 16;
621 height = 16; 437 height = 16;
622 reset_timeout = 0;
623 timeout = 300; 438 timeout = 300;
624 enter_x = 0; 439 max_items = MAX_ITEM_PER_ACTION;
625 enter_y = 0; 440 max_volume = 2000000; // 2m³
626} 441}
627 442
628maptile::maptile (int w, int h) 443maptile::maptile (int w, int h)
629{ 444{
630 in_memory = MAP_SWAPPED; 445 in_memory = MAP_SWAPPED;
650 if (spaces) 465 if (spaces)
651 return; 466 return;
652 467
653 spaces = salloc0<mapspace> (size ()); 468 spaces = salloc0<mapspace> (size ());
654} 469}
470
471//+GPL
655 472
656/* Takes a string from a map definition and outputs a pointer to the array of shopitems 473/* Takes a string from a map definition and outputs a pointer to the array of shopitems
657 * corresponding to that string. Memory is allocated for this, it must be freed 474 * corresponding to that string. Memory is allocated for this, it must be freed
658 * at a later date. 475 * at a later date.
659 * Called by parse_map_headers below. 476 * Called by parse_map_headers below.
736 return items; 553 return items;
737} 554}
738 555
739/* opposite of parse string, this puts the string that was originally fed in to 556/* opposite of parse string, this puts the string that was originally fed in to
740 * the map (or something equivilent) into output_string. */ 557 * the map (or something equivilent) into output_string. */
741static void 558static const char *
742print_shop_string (maptile *m, char *output_string) 559print_shop_string (maptile *m)
743{ 560{
744 int i; 561 static dynbuf_text buf; buf.clear ();
745 char tmp[MAX_BUF];
746 562
747 strcpy (output_string, "");
748 for (i = 0; i < m->shopitems[0].index; i++) 563 for (int i = 0; i < m->shopitems[0].index; i++)
749 { 564 {
750 if (m->shopitems[i].typenum) 565 if (m->shopitems[i].typenum)
751 { 566 {
752 if (m->shopitems[i].strength) 567 if (m->shopitems[i].strength)
753 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 568 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
754 else 569 else
755 sprintf (tmp, "%s;", m->shopitems[i].name); 570 buf.printf ("%s;", m->shopitems[i].name);
756 } 571 }
757 else 572 else
758 { 573 {
759 if (m->shopitems[i].strength) 574 if (m->shopitems[i].strength)
760 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 575 buf.printf ("*:%d;", m->shopitems[i].strength);
761 else 576 else
762 sprintf (tmp, "*"); 577 buf.printf ("*");
763 } 578 }
764
765 strcat (output_string, tmp);
766 } 579 }
580
581 return buf;
767} 582}
583
584//-GPL
768 585
769/* This loads the header information of the map. The header 586/* This loads the header information of the map. The header
770 * contains things like difficulty, size, timeout, etc. 587 * contains things like difficulty, size, timeout, etc.
771 * this used to be stored in the map object, but with the 588 * this used to be stored in the map object, but with the
772 * addition of tiling, fields beyond that easily named in an 589 * addition of tiling, fields beyond that easily named in an
776 * This could be done in lex (like the object loader), but I think 593 * This could be done in lex (like the object loader), but I think
777 * currently, there are few enough fields this is not a big deal. 594 * currently, there are few enough fields this is not a big deal.
778 * MSW 2001-07-01 595 * MSW 2001-07-01
779 */ 596 */
780bool 597bool
781maptile::load_header (object_thawer &thawer) 598maptile::_load_header (object_thawer &thawer)
782{ 599{
783 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
784 int msgpos = 0;
785 int maplorepos = 0;
786
787 for (;;) 600 for (;;)
788 { 601 {
789 keyword kw = thawer.get_kv ();
790
791 switch (kw) 602 switch (thawer.kw)
792 { 603 {
793 case KW_EOF:
794 LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path);
795 return false;
796
797 case KW_end:
798 return true;
799
800 case KW_msg: 604 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg); 605 thawer.get_ml (KW_endmsg, msg);
802 break; 606 break;
803 607
804 case KW_lore: // CF+ extension 608 case KW_lore: // CF+ extension
826 case KW_shopgreed: thawer.get (shopgreed); break; 630 case KW_shopgreed: thawer.get (shopgreed); break;
827 case KW_shopmin: thawer.get (shopmin); break; 631 case KW_shopmin: thawer.get (shopmin); break;
828 case KW_shopmax: thawer.get (shopmax); break; 632 case KW_shopmax: thawer.get (shopmax); break;
829 case KW_shoprace: thawer.get (shoprace); break; 633 case KW_shoprace: thawer.get (shoprace); break;
830 case KW_outdoor: thawer.get (outdoor); break; 634 case KW_outdoor: thawer.get (outdoor); break;
831 case KW_temp: thawer.get (temp); break;
832 case KW_pressure: thawer.get (pressure); break;
833 case KW_humid: thawer.get (humid); break;
834 case KW_windspeed: thawer.get (windspeed); break;
835 case KW_winddir: thawer.get (winddir); break;
836 case KW_sky: thawer.get (sky); break;
837 635
838 case KW_per_player: thawer.get (per_player); break; 636 case KW_per_player: thawer.get (per_player); break;
839 case KW_per_party: thawer.get (per_party); break; 637 case KW_per_party: thawer.get (per_party); break;
638 case KW_no_reset: thawer.get (no_reset); break;
639 case KW_no_drop: thawer.get (no_drop); break;
840 640
841 case KW_region: get_region_by_name (thawer.get_str ()); break; 641 case KW_region: default_region = region::find (thawer.get_str ()); break;
842 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 642 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
843 643
844 // old names new names 644 // old names new names
845 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 645 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
846 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 646 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
855 case KW_tile_path_1: thawer.get (tile_path [0]); break; 655 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break; 656 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break; 657 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break; 658 case KW_tile_path_4: thawer.get (tile_path [3]); break;
859 659
660 case KW_ERROR:
661 set_key_text (thawer.kw_str, thawer.value);
662 break;
663
664 case KW_end:
665 thawer.next ();
666 return true;
667
860 default: 668 default:
861 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); 669 if (!thawer.parse_error ("map", 0))
670 return false;
862 break; 671 break;
863 } 672 }
673
674 thawer.next ();
864 } 675 }
865 676
866 abort (); 677 abort ();
867} 678}
868 679
869bool 680//+GPL
870maptile::load_header (const char *path)
871{
872 object_thawer thawer (path);
873
874 if (!thawer)
875 return false;
876
877 return load_header (thawer);
878}
879 681
880/****************************************************************************** 682/******************************************************************************
881 * This is the start of unique map handling code 683 * This is the start of unique map handling code
882 *****************************************************************************/ 684 *****************************************************************************/
883 685
893 object *above = op->above; 695 object *above = op->above;
894 696
895 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 697 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
896 unique = 1; 698 unique = 1;
897 699
898 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 700 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
899 {
900 op->destroy_inv (false);
901 op->destroy (); 701 op->destroy ();
902 }
903 702
904 op = above; 703 op = above;
905 } 704 }
906 } 705 }
907} 706}
908 707
708//-GPL
709
909bool 710bool
910maptile::save_header (object_freezer &freezer) 711maptile::_save_header (object_freezer &freezer)
911{ 712{
912#define MAP_OUT(k) freezer.put (KW_ ## k, k) 713#define MAP_OUT(k) freezer.put (KW(k), k)
913#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 714#define MAP_OUT2(k,v) freezer.put (KW(k), v)
914 715
915 MAP_OUT2 (arch, "map"); 716 MAP_OUT2 (arch, CS(map));
916 717
917 if (name) MAP_OUT (name); 718 if (name) MAP_OUT (name);
918 MAP_OUT (swap_time); 719 MAP_OUT (swap_time);
919 MAP_OUT (reset_time); 720 MAP_OUT (reset_time);
920 MAP_OUT (reset_timeout); 721 MAP_OUT (reset_timeout);
921 MAP_OUT (fixed_resettime); 722 MAP_OUT (fixed_resettime);
723 MAP_OUT (no_reset);
724 MAP_OUT (no_drop);
922 MAP_OUT (difficulty); 725 MAP_OUT (difficulty);
923
924 if (region) MAP_OUT2 (region, region->name); 726 if (default_region) MAP_OUT2 (region, default_region->name);
925 727
926 if (shopitems) 728 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
927 {
928 char shop[MAX_BUF];
929 print_shop_string (this, shop);
930 MAP_OUT2 (shopitems, shop);
931 }
932
933 MAP_OUT (shopgreed); 729 MAP_OUT (shopgreed);
934 MAP_OUT (shopmin); 730 MAP_OUT (shopmin);
935 MAP_OUT (shopmax); 731 MAP_OUT (shopmax);
936 if (shoprace) MAP_OUT (shoprace); 732 if (shoprace) MAP_OUT (shoprace);
937 MAP_OUT (darkness); 733
938 MAP_OUT (width); 734 MAP_OUT (width);
939 MAP_OUT (height); 735 MAP_OUT (height);
940 MAP_OUT (enter_x); 736 MAP_OUT (enter_x);
941 MAP_OUT (enter_y); 737 MAP_OUT (enter_y);
942 738 MAP_OUT (darkness);
943 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
944 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
945
946 MAP_OUT (outdoor); 739 MAP_OUT (outdoor);
947 MAP_OUT (temp); 740
948 MAP_OUT (pressure); 741 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
949 MAP_OUT (humid); 742 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
950 MAP_OUT (windspeed);
951 MAP_OUT (winddir);
952 MAP_OUT (sky);
953 743
954 MAP_OUT (per_player); 744 MAP_OUT (per_player);
955 MAP_OUT (per_party); 745 MAP_OUT (per_party);
956 746
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 747 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
958 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 748 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
959 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 749 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
960 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 750 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961 751
962 MAP_OUT2 (end, 0); 752 freezer.put (this);
753 freezer.put (KW(end));
963 754
964 return true; 755 return true;
965} 756}
966 757
967bool 758bool
968maptile::save_header (const char *path) 759maptile::_save_header (const char *path)
969{ 760{
970 object_freezer freezer; 761 object_freezer freezer;
971 762
972 if (!save_header (freezer)) 763 if (!_save_header (freezer))
973 return false; 764 return false;
974 765
975 return freezer.save (path); 766 return freezer.save (path);
976} 767}
768
769//+GPL
977 770
978/* 771/*
979 * Remove and free all objects in the given map. 772 * Remove and free all objects in the given map.
980 */ 773 */
981void 774void
982maptile::clear () 775maptile::clear ()
983{ 776{
984 if (!spaces) 777 if (spaces)
985 return; 778 {
986
987 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 779 for (mapspace *ms = spaces + size (); ms-- > spaces; )
988 while (object *op = ms->bot) 780 while (object *op = ms->bot)
989 { 781 {
782 // manually remove, as to not trigger anything
783 if (ms->bot = op->above)
784 ms->bot->below = 0;
785
786 op->flag [FLAG_REMOVED] = true;
787
788 object *head = op->head_ ();
990 if (op->head) 789 if (op == head)
991 op = op->head;
992
993 op->destroy_inv (false);
994 op->destroy (); 790 op->destroy ();
791 else if (head->map != op->map)
792 {
793 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
794 head->destroy ();
795 }
796 }
797
798 sfree0 (spaces, size ());
995 } 799 }
996
997 sfree (spaces, size ()), spaces = 0;
998 800
999 if (buttons) 801 if (buttons)
1000 free_objectlinkpt (buttons), buttons = 0; 802 free_objectlinkpt (buttons), buttons = 0;
803
804 sfree0 (regions, size ());
805 delete [] regionmap; regionmap = 0;
1001} 806}
1002 807
1003void 808void
1004maptile::clear_header () 809maptile::clear_header ()
1005{ 810{
1037 attachable::do_destroy (); 842 attachable::do_destroy ();
1038 843
1039 clear (); 844 clear ();
1040} 845}
1041 846
1042/* 847/* decay and destroy perishable items in a map */
1043 * Updates every button on the map (by calling update_button() for them). 848// TODO: should be done regularly, not on map load?
1044 */
1045void 849void
1046maptile::update_buttons () 850maptile::do_decay_objects ()
1047{ 851{
1048 for (oblinkpt *obp = buttons; obp; obp = obp->next) 852 if (!spaces)
1049 for (objectlink *ol = obp->link; ol; ol = ol->next) 853 return;
854
855 for (mapspace *ms = spaces + size (); ms-- > spaces; )
856 for (object *above, *op = ms->bot; op; op = above)
1050 { 857 {
1051 if (!ol->ob) 858 above = op->above;
859
860 bool destroy = 0;
861
862 // do not decay anything above unique floor tiles (yet :)
863 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
864 break;
865
866 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
867 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
868 || QUERY_FLAG (op, FLAG_UNIQUE)
869 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
870 || QUERY_FLAG (op, FLAG_UNPAID)
871 || op->is_alive ())
872 ; // do not decay
873 else if (op->is_weapon ())
1052 { 874 {
1053 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 875 op->stats.dam--;
1054 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 876 if (op->stats.dam < 0)
1055 continue; 877 destroy = 1;
1056 } 878 }
1057 879 else if (op->is_armor ())
1058 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1059 { 880 {
1060 update_button (ol->ob); 881 op->stats.ac--;
1061 break; 882 if (op->stats.ac < 0)
883 destroy = 1;
1062 } 884 }
885 else if (op->type == FOOD)
886 {
887 op->stats.food -= rndm (5, 20);
888 if (op->stats.food < 0)
889 destroy = 1;
890 }
891 else
892 {
893 int mat = op->materials;
894
895 if (mat & M_PAPER
896 || mat & M_LEATHER
897 || mat & M_WOOD
898 || mat & M_ORGANIC
899 || mat & M_CLOTH
900 || mat & M_LIQUID
901 || (mat & M_IRON && rndm (1, 5) == 1)
902 || (mat & M_GLASS && rndm (1, 2) == 1)
903 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
904 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
905 //|| (mat & M_ICE && temp > 32)
906 )
907 destroy = 1;
908 }
909
910 /* adjust overall chance below */
911 if (destroy && rndm (0, 1))
912 op->destroy ();
1063 } 913 }
1064} 914}
1065 915
1066/* 916/*
1067 * This routine is supposed to find out the difficulty of the map. 917 * This routine is supposed to find out the difficulty of the map.
1068 * difficulty does not have a lot to do with character level, 918 * difficulty does not have a lot to do with character level,
1069 * but does have a lot to do with treasure on the map. 919 * but does have a lot to do with treasure on the map.
1070 * 920 *
1071 * Difficulty can now be set by the map creature. If the value stored 921 * Difficulty can now be set by the map creator. If the value stored
1072 * in the map is zero, then use this routine. Maps should really 922 * in the map is zero, then use this routine. Maps should really
1073 * have a difficulty set than using this function - human calculation 923 * have a difficulty set rather than using this function - human calculation
1074 * is much better than this functions guesswork. 924 * is much better than this function's guesswork.
1075 */ 925 */
1076int 926int
1077maptile::estimate_difficulty () const 927maptile::estimate_difficulty () const
1078{ 928{
1079 long monster_cnt = 0; 929 long monster_cnt = 0;
1091 941
1092 if (QUERY_FLAG (op, FLAG_GENERATOR)) 942 if (QUERY_FLAG (op, FLAG_GENERATOR))
1093 { 943 {
1094 total_exp += op->stats.exp; 944 total_exp += op->stats.exp;
1095 945
1096 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 946 if (archetype *at = op->other_arch)
947 {
1097 total_exp += at->clone.stats.exp * 8; 948 total_exp += at->stats.exp * 8;
1098
1099 monster_cnt++; 949 monster_cnt++;
950 }
951
952 for (object *inv = op->inv; inv; inv = inv->below)
953 {
954 total_exp += op->stats.exp * 8;
955 monster_cnt++;
956 }
1100 } 957 }
1101 } 958 }
1102 959
1103 avgexp = (double) total_exp / monster_cnt; 960 avgexp = (double) total_exp / monster_cnt;
1104 961
1117 * postive values make it darker, negative make it brighter 974 * postive values make it darker, negative make it brighter
1118 */ 975 */
1119int 976int
1120maptile::change_map_light (int change) 977maptile::change_map_light (int change)
1121{ 978{
1122 int new_level = darkness + change;
1123
1124 /* Nothing to do */ 979 /* Nothing to do */
1125 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 980 if (!change)
1126 return 0; 981 return 0;
1127 982
1128 /* inform all players on the map */ 983 /* inform all players on the map */
1129 if (change > 0) 984 if (change > 0)
1130 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 985 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1131 else 986 else
1132 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 987 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1133 988
1134 /* Do extra checking. since darkness is a unsigned value, 989 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1135 * we need to be extra careful about negative values.
1136 * In general, the checks below are only needed if change
1137 * is not +/-1
1138 */
1139 if (new_level < 0)
1140 darkness = 0;
1141 else if (new_level >= MAX_DARKNESS)
1142 darkness = MAX_DARKNESS;
1143 else
1144 darkness = new_level;
1145 990
1146 /* All clients need to get re-updated for the change */ 991 /* All clients need to get re-updated for the change */
1147 update_all_map_los (this); 992 update_all_map_los (this);
993
1148 return 1; 994 return 1;
1149} 995}
1150 996
1151/* 997/*
1152 * This function updates various attributes about a specific space 998 * This function updates various attributes about a specific space
1155 * through, etc) 1001 * through, etc)
1156 */ 1002 */
1157void 1003void
1158mapspace::update_ () 1004mapspace::update_ ()
1159{ 1005{
1160 object *tmp, *last = 0; 1006 object *last = 0;
1161 uint8 flags = 0, light = 0, anywhere = 0; 1007 uint8 flags = P_UPTODATE;
1162 New_Face *top, *floor, *middle; 1008 sint8 light = 0;
1163 object *top_obj, *floor_obj, *middle_obj;
1164 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1009 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1010 uint64_t volume = 0;
1011 uint32_t items = 0;
1012 object *anywhere = 0;
1013 uint8_t middle_visibility = 0;
1165 1014
1166 middle = blank_face; 1015 //object *middle = 0;
1167 top = blank_face; 1016 //object *top = 0;
1168 floor = blank_face; 1017 //object *floor = 0;
1018 // this seems to generate better code than using locals, above
1019 object *&top = faces_obj[0] = 0;
1020 object *&middle = faces_obj[1] = 0;
1021 object *&floor = faces_obj[2] = 0;
1169 1022
1170 middle_obj = 0; 1023 object::flags_t allflags; // all flags of all objects or'ed together
1171 top_obj = 0;
1172 floor_obj = 0;
1173 1024
1174 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1025 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1175 { 1026 {
1176 /* This could be made additive I guess (two lights better than 1027 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1177 * one). But if so, it shouldn't be a simple additive - 2
1178 * light bulbs do not illuminate twice as far as once since
1179 * it is a dissapation factor that is cubed.
1180 */
1181 if (tmp->glow_radius > light)
1182 light = tmp->glow_radius; 1028 light += tmp->glow_radius;
1183 1029
1184 /* This call is needed in order to update objects the player 1030 /* This call is needed in order to update objects the player
1185 * is standing in that have animations (ie, grass, fire, etc). 1031 * is standing in that have animations (ie, grass, fire, etc).
1186 * However, it also causes the look window to be re-drawn 1032 * However, it also causes the look window to be re-drawn
1187 * 3 times each time the player moves, because many of the 1033 * 3 times each time the player moves, because many of the
1188 * functions the move_player calls eventualy call this. 1034 * functions the move_player calls eventualy call this.
1189 * 1035 *
1190 * Always put the player down for drawing. 1036 * Always put the player down for drawing.
1191 */ 1037 */
1192 if (!tmp->invisible) 1038 if (expect_true (!tmp->invisible))
1193 { 1039 {
1194 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1040 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1195 {
1196 top = tmp->face;
1197 top_obj = tmp; 1041 top = tmp;
1198 } 1042 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1199 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1200 { 1043 {
1201 /* If we got a floor, that means middle and top were below it, 1044 /* If we got a floor, that means middle and top were below it,
1202 * so should not be visible, so we clear them. 1045 * so should not be visible, so we clear them.
1203 */ 1046 */
1204 middle = blank_face; 1047 middle = 0;
1205 top = blank_face; 1048 top = 0;
1206 floor = tmp->face;
1207 floor_obj = tmp; 1049 floor = tmp;
1050 volume = 0;
1051 items = 0;
1208 } 1052 }
1209 /* Flag anywhere have high priority */ 1053 else
1210 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1211 { 1054 {
1212 middle = tmp->face; 1055 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1056 {
1057 ++items;
1058 volume += tmp->volume ();
1059 }
1213 1060
1214 middle_obj = tmp; 1061 /* Flag anywhere have high priority */
1062 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1215 anywhere = 1; 1063 anywhere = tmp;
1064
1065 /* Find the highest visible face around. If equal
1066 * visibilities, we still want the one nearer to the
1067 * top
1068 */
1069 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1070 {
1071 middle_visibility = ::faces [tmp->face].visibility;
1072 middle = tmp;
1073 }
1216 } 1074 }
1217 /* Find the highest visible face around. If equal
1218 * visibilities, we still want the one nearer to the
1219 * top
1220 */
1221 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere))
1222 {
1223 middle = tmp->face;
1224 middle_obj = tmp;
1225 }
1226 }
1227
1228 if (tmp == tmp->above)
1229 {
1230 LOG (llevError, "Error in structure of map\n");
1231 exit (-1);
1232 } 1075 }
1233 1076
1234 move_slow |= tmp->move_slow; 1077 move_slow |= tmp->move_slow;
1235 move_block |= tmp->move_block; 1078 move_block |= tmp->move_block;
1236 move_on |= tmp->move_on; 1079 move_on |= tmp->move_on;
1237 move_off |= tmp->move_off; 1080 move_off |= tmp->move_off;
1238 move_allow |= tmp->move_allow; 1081 move_allow |= tmp->move_allow;
1239 1082
1240 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1083 allflags |= tmp->flag;
1241 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1084
1242 if (tmp->type == PLAYER) flags |= P_PLAYER; 1085 if (tmp->type == PLAYER) flags |= P_PLAYER;
1243 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1086 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1244 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1245 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1246 } 1087 }
1247 1088
1248 this->light = light; 1089 // FLAG_SEE_ANYWHERE takes precedence
1090 if (anywhere)
1091 middle = anywhere;
1092
1093 // ORing all flags together and checking them here is much faster
1094 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1095 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1096 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1097 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1098
1099 this->light = min (light, MAX_LIGHT_RADIUS);
1249 this->flags_ = flags; 1100 this->flags_ = flags;
1250 this->move_block = move_block & ~move_allow; 1101 this->move_block = move_block & ~move_allow;
1251 this->move_on = move_on; 1102 this->move_on = move_on;
1252 this->move_off = move_off; 1103 this->move_off = move_off;
1253 this->move_slow = move_slow; 1104 this->move_slow = move_slow;
1105 this->volume_ = (volume + 1023) / 1024;
1106 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1254 1107
1255 /* At this point, we have a floor face (if there is a floor), 1108 /* At this point, we have a floor face (if there is a floor),
1256 * and the floor is set - we are not going to touch it at 1109 * and the floor is set - we are not going to touch it at
1257 * this point. 1110 * this point.
1258 * middle contains the highest visibility face. 1111 * middle contains the highest visibility face.
1265 * middle face. This should not happen, as we already have the 1118 * middle face. This should not happen, as we already have the
1266 * else statement above so middle should not get set. OTOH, it 1119 * else statement above so middle should not get set. OTOH, it
1267 * may be possible for the faces to match but be different objects. 1120 * may be possible for the faces to match but be different objects.
1268 */ 1121 */
1269 if (top == middle) 1122 if (top == middle)
1270 middle = blank_face; 1123 middle = 0;
1271 1124
1272 /* There are three posibilities at this point: 1125 /* There are three posibilities at this point:
1273 * 1) top face is set, need middle to be set. 1126 * 1) top face is set, need middle to be set.
1274 * 2) middle is set, need to set top. 1127 * 2) middle is set, need to set top.
1275 * 3) neither middle or top is set - need to set both. 1128 * 3) neither middle or top is set - need to set both.
1276 */ 1129 */
1277 1130
1278 for (tmp = last; tmp; tmp = tmp->below) 1131 for (object *tmp = last; tmp; tmp = tmp->below)
1279 { 1132 {
1280 /* Once we get to a floor, stop, since we already have a floor object */ 1133 /* Once we get to a floor, stop, since we already have a floor object */
1281 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1134 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1282 break; 1135 break;
1283 1136
1284 /* If two top faces are already set, quit processing */ 1137 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1138 if (top && middle)
1286 break; 1139 break;
1287 1140
1288 /* Only show visible faces, unless its the editor - show all */ 1141 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1142 if (!tmp->invisible)
1290 { 1143 {
1291 /* Fill in top if needed */ 1144 /* Fill in top if needed */
1292 if (top == blank_face) 1145 if (!top)
1293 { 1146 {
1294 top = tmp->face;
1295 top_obj = tmp; 1147 top = tmp;
1296 if (top == middle) 1148 if (top == middle)
1297 middle = blank_face; 1149 middle = 0;
1298 } 1150 }
1299 else 1151 else
1300 { 1152 {
1301 /* top is already set - we should only get here if 1153 /* top is already set - we should only get here if
1302 * middle is not set 1154 * middle is not set
1303 * 1155 *
1304 * Set the middle face and break out, since there is nothing 1156 * Set the middle face and break out, since there is nothing
1305 * more to fill in. We don't check visiblity here, since 1157 * more to fill in. We don't check visiblity here, since
1306 * 1158 *
1307 */ 1159 */
1308 if (tmp->face != top) 1160 if (tmp != top)
1309 { 1161 {
1310 middle = tmp->face;
1311 middle_obj = tmp; 1162 middle = tmp;
1312 break; 1163 break;
1313 } 1164 }
1314 } 1165 }
1315 } 1166 }
1316 } 1167 }
1317 1168
1318 if (middle == floor) 1169 if (middle == floor)
1319 middle = blank_face; 1170 middle = 0;
1320 1171
1321 if (top == middle) 1172 if (top == middle)
1322 middle = blank_face; 1173 middle = 0;
1323 1174
1324 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1175#if 0
1325 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1176 faces_obj [0] = top;
1326 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1177 faces_obj [1] = middle;
1178 faces_obj [2] = floor;
1179#endif
1327} 1180}
1328 1181
1329void 1182maptile *
1330set_map_reset_time (maptile *map) 1183maptile::tile_available (int dir, bool load)
1331{ 1184{
1332 int timeout = map->reset_timeout; 1185 if (tile_path[dir])
1186 {
1187 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1188 return tile_map[dir];
1333 1189
1334 if (timeout <= 0) 1190 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1335 timeout = MAP_DEFAULTRESET; 1191 return tile_map[dir];
1336 if (timeout >= MAP_MAXRESET) 1192 }
1337 timeout = MAP_MAXRESET;
1338 1193
1339 map->reset_time = time (0) + timeout;
1340}
1341
1342/* this updates the orig_map->tile_map[tile_num] value after loading
1343 * the map. It also takes care of linking back the freshly loaded
1344 * maps tile_map values if it tiles back to this one. It returns
1345 * the value of orig_map->tile_map[tile_num]. It really only does this
1346 * so that it is easier for calling functions to verify success.
1347 */
1348static maptile *
1349load_and_link_tiled_map (maptile *orig_map, int tile_num)
1350{
1351 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]);
1352 mp->load ();
1353
1354 int dest_tile = (tile_num + 2) % 4;
1355
1356 orig_map->tile_map[tile_num] = mp;
1357
1358 /* need to do a strcmp here as the orig_map->path is not a shared string */
1359 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1360 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1361
1362 return mp; 1194 return 0;
1363} 1195}
1364 1196
1365/* this returns TRUE if the coordinates (x,y) are out of 1197/* this returns TRUE if the coordinates (x,y) are out of
1366 * map m. This function also takes into account any 1198 * map m. This function also takes into account any
1367 * tiling considerations, loading adjacant maps as needed. 1199 * tiling considerations, loading adjacant maps as needed.
1380 if (!m) 1212 if (!m)
1381 return 0; 1213 return 0;
1382 1214
1383 if (x < 0) 1215 if (x < 0)
1384 { 1216 {
1385 if (!m->tile_path[3]) 1217 if (!m->tile_available (3))
1386 return 1; 1218 return 1;
1387 1219
1388 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1389 load_and_link_tiled_map (m, 3);
1390
1391 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1220 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1392 } 1221 }
1393 1222
1394 if (x >= m->width) 1223 if (x >= m->width)
1395 { 1224 {
1396 if (!m->tile_path[1]) 1225 if (!m->tile_available (1))
1397 return 1; 1226 return 1;
1398 1227
1399 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1400 load_and_link_tiled_map (m, 1);
1401
1402 return out_of_map (m->tile_map[1], x - m->width, y); 1228 return out_of_map (m->tile_map[1], x - m->width, y);
1403 } 1229 }
1404 1230
1405 if (y < 0) 1231 if (y < 0)
1406 { 1232 {
1407 if (!m->tile_path[0]) 1233 if (!m->tile_available (0))
1408 return 1; 1234 return 1;
1409 1235
1410 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1411 load_and_link_tiled_map (m, 0);
1412
1413 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1236 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1414 } 1237 }
1415 1238
1416 if (y >= m->height) 1239 if (y >= m->height)
1417 { 1240 {
1418 if (!m->tile_path[2]) 1241 if (!m->tile_available (2))
1419 return 1; 1242 return 1;
1420
1421 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1422 load_and_link_tiled_map (m, 2);
1423 1243
1424 return out_of_map (m->tile_map[2], x, y - m->height); 1244 return out_of_map (m->tile_map[2], x, y - m->height);
1425 } 1245 }
1426 1246
1427 /* Simple case - coordinates are within this local 1247 /* Simple case - coordinates are within this local
1432 1252
1433/* This is basically the same as out_of_map above, but 1253/* This is basically the same as out_of_map above, but
1434 * instead we return NULL if no map is valid (coordinates 1254 * instead we return NULL if no map is valid (coordinates
1435 * out of bounds and no tiled map), otherwise it returns 1255 * out of bounds and no tiled map), otherwise it returns
1436 * the map as that the coordinates are really on, and 1256 * the map as that the coordinates are really on, and
1437 * updates x and y to be the localized coordinates. 1257 * updates x and y to be the localised coordinates.
1438 * Using this is more efficient of calling out_of_map 1258 * Using this is more efficient of calling out_of_map
1439 * and then figuring out what the real map is 1259 * and then figuring out what the real map is
1440 */ 1260 */
1441maptile * 1261maptile *
1442get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1262maptile::xy_find (sint16 &x, sint16 &y)
1443{ 1263{
1444 if (*x < 0) 1264 if (x < 0)
1445 { 1265 {
1446 if (!m->tile_path[3]) 1266 if (!tile_available (3))
1447 return 0; 1267 return 0;
1448 1268
1449 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1450 load_and_link_tiled_map (m, 3);
1451
1452 *x += m->tile_map[3]->width; 1269 x += tile_map[3]->width;
1453 return (get_map_from_coord (m->tile_map[3], x, y)); 1270 return tile_map[3]->xy_find (x, y);
1454 } 1271 }
1455 1272
1456 if (*x >= m->width) 1273 if (x >= width)
1457 { 1274 {
1458 if (!m->tile_path[1]) 1275 if (!tile_available (1))
1459 return 0; 1276 return 0;
1460 1277
1461 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1462 load_and_link_tiled_map (m, 1);
1463
1464 *x -= m->width; 1278 x -= width;
1465 return (get_map_from_coord (m->tile_map[1], x, y)); 1279 return tile_map[1]->xy_find (x, y);
1466 } 1280 }
1467 1281
1468 if (*y < 0) 1282 if (y < 0)
1469 { 1283 {
1470 if (!m->tile_path[0]) 1284 if (!tile_available (0))
1471 return 0; 1285 return 0;
1472 1286
1473 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1474 load_and_link_tiled_map (m, 0);
1475
1476 *y += m->tile_map[0]->height; 1287 y += tile_map[0]->height;
1477 return (get_map_from_coord (m->tile_map[0], x, y)); 1288 return tile_map[0]->xy_find (x, y);
1478 } 1289 }
1479 1290
1480 if (*y >= m->height) 1291 if (y >= height)
1481 { 1292 {
1482 if (!m->tile_path[2]) 1293 if (!tile_available (2))
1483 return 0; 1294 return 0;
1484 1295
1485 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1486 load_and_link_tiled_map (m, 2);
1487
1488 *y -= m->height; 1296 y -= height;
1489 return (get_map_from_coord (m->tile_map[2], x, y)); 1297 return tile_map[2]->xy_find (x, y);
1490 } 1298 }
1491 1299
1492 /* Simple case - coordinates are within this local 1300 /* Simple case - coordinates are within this local
1493 * map. 1301 * map.
1494 */ 1302 */
1495
1496 m->last_access = runtime;
1497 return m; 1303 return this;
1498} 1304}
1499 1305
1500/** 1306/**
1501 * Return whether map2 is adjacent to map1. If so, store the distance from 1307 * Return whether map2 is adjacent to map1. If so, store the distance from
1502 * map1 to map2 in dx/dy. 1308 * map1 to map2 in dx/dy.
1503 */ 1309 */
1504static int 1310int
1505adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1311adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1506{ 1312{
1507 if (!map1 || !map2) 1313 if (!map1 || !map2)
1508 return 0; 1314 return 0;
1509 1315
1316 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1317 //fix: compare paths instead (this is likely faster, too!)
1510 if (map1 == map2) 1318 if (map1 == map2)
1511 { 1319 {
1512 *dx = 0; 1320 *dx = 0;
1513 *dy = 0; 1321 *dy = 0;
1514 } 1322 }
1574 } 1382 }
1575 else 1383 else
1576 return 0; 1384 return 0;
1577 1385
1578 return 1; 1386 return 1;
1387}
1388
1389maptile *
1390maptile::xy_load (sint16 &x, sint16 &y)
1391{
1392 maptile *map = xy_find (x, y);
1393
1394 if (map)
1395 map->load_sync ();
1396
1397 return map;
1398}
1399
1400maptile *
1401get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1402{
1403 return m->xy_load (*x, *y);
1579} 1404}
1580 1405
1581/* From map.c 1406/* From map.c
1582 * This is used by get_player to determine where the other 1407 * This is used by get_player to determine where the other
1583 * creature is. get_rangevector takes into account map tiling, 1408 * creature is. get_rangevector takes into account map tiling,
1584 * so you just can not look the the map coordinates and get the 1409 * so you just can not look the the map coordinates and get the
1585 * righte value. distance_x/y are distance away, which 1410 * righte value. distance_x/y are distance away, which
1586 * can be negativbe. direction is the crossfire direction scheme 1411 * can be negative. direction is the crossfire direction scheme
1587 * that the creature should head. part is the part of the 1412 * that the creature should head. part is the part of the
1588 * monster that is closest. 1413 * monster that is closest.
1589 * 1414 *
1590 * get_rangevector looks at op1 and op2, and fills in the 1415 * get_rangevector looks at op1 and op2, and fills in the
1591 * structure for op1 to get to op2. 1416 * structure for op1 to get to op2.
1602get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1427get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1603{ 1428{
1604 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1429 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1605 { 1430 {
1606 /* be conservative and fill in _some_ data */ 1431 /* be conservative and fill in _some_ data */
1607 retval->distance = 100000; 1432 retval->distance = 10000;
1608 retval->distance_x = 32767; 1433 retval->distance_x = 10000;
1609 retval->distance_y = 32767; 1434 retval->distance_y = 10000;
1610 retval->direction = 0; 1435 retval->direction = 0;
1611 retval->part = 0; 1436 retval->part = 0;
1612 } 1437 }
1613 else 1438 else
1614 { 1439 {
1619 1444
1620 best = op1; 1445 best = op1;
1621 /* If this is multipart, find the closest part now */ 1446 /* If this is multipart, find the closest part now */
1622 if (!(flags & 0x1) && op1->more) 1447 if (!(flags & 0x1) && op1->more)
1623 { 1448 {
1624 object *tmp;
1625 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1449 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1626 1450
1627 /* we just take the offset of the piece to head to figure 1451 /* we just take the offset of the piece to head to figure
1628 * distance instead of doing all that work above again 1452 * distance instead of doing all that work above again
1629 * since the distance fields we set above are positive in the 1453 * since the distance fields we set above are positive in the
1630 * same axis as is used for multipart objects, the simply arithmetic 1454 * same axis as is used for multipart objects, the simply arithmetic
1631 * below works. 1455 * below works.
1632 */ 1456 */
1633 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1457 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1634 { 1458 {
1635 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1459 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1636 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1460 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1637 if (tmpi < best_distance) 1461 if (tmpi < best_distance)
1638 { 1462 {
1639 best_distance = tmpi; 1463 best_distance = tmpi;
1640 best = tmp; 1464 best = tmp;
1641 } 1465 }
1642 } 1466 }
1467
1643 if (best != op1) 1468 if (best != op1)
1644 { 1469 {
1645 retval->distance_x += op1->x - best->x; 1470 retval->distance_x += op1->x - best->x;
1646 retval->distance_y += op1->y - best->y; 1471 retval->distance_y += op1->y - best->y;
1647 } 1472 }
1648 } 1473 }
1474
1649 retval->part = best; 1475 retval->part = best;
1650 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1476 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1651 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1477 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1652 } 1478 }
1653} 1479}
1654 1480
1655/* this is basically the same as get_rangevector above, but instead of 1481/* this is basically the same as get_rangevector above, but instead of
1660 * flags has no meaning for this function at this time - I kept it in to 1486 * flags has no meaning for this function at this time - I kept it in to
1661 * be more consistant with the above function and also in case they are needed 1487 * be more consistant with the above function and also in case they are needed
1662 * for something in the future. Also, since no object is pasted, the best 1488 * for something in the future. Also, since no object is pasted, the best
1663 * field of the rv_vector is set to NULL. 1489 * field of the rv_vector is set to NULL.
1664 */ 1490 */
1665
1666void 1491void
1667get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1492get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1668{ 1493{
1669 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1494 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1670 { 1495 {
1671 /* be conservative and fill in _some_ data */ 1496 /* be conservative and fill in _some_ data */
1672 retval->distance = 100000; 1497 retval->distance = 100000;
1678 else 1503 else
1679 { 1504 {
1680 retval->distance_x += op2->x - x; 1505 retval->distance_x += op2->x - x;
1681 retval->distance_y += op2->y - y; 1506 retval->distance_y += op2->y - y;
1682 1507
1683 retval->part = NULL; 1508 retval->part = 0;
1684 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1509 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1685 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1510 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1686 } 1511 }
1687} 1512}
1688 1513
1689/* Returns true of op1 and op2 are effectively on the same map 1514/* Returns true of op1 and op2 are effectively on the same map
1700 int dx, dy; 1525 int dx, dy;
1701 1526
1702 return adjacent_map (op1->map, op2->map, &dx, &dy); 1527 return adjacent_map (op1->map, op2->map, &dx, &dy);
1703} 1528}
1704 1529
1530//-GPL
1531
1705object * 1532object *
1706maptile::insert (object *op, int x, int y, object *originator, int flags) 1533maptile::insert (object *op, int x, int y, object *originator, int flags)
1707{ 1534{
1708 if (!op->flag [FLAG_REMOVED])
1709 op->remove ();
1710
1711 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1535 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1712} 1536}
1713 1537
1538region *
1539maptile::region (int x, int y) const
1540{
1541 if (regions
1542 && regionmap
1543 && !OUT_OF_REAL_MAP (this, x, y))
1544 if (struct region *reg = regionmap [regions [y * width + x]])
1545 return reg;
1546
1547 if (default_region)
1548 return default_region;
1549
1550 return ::region::default_region ();
1551}
1552
1553//+GPL
1554
1555/* picks a random object from a style map.
1556 */
1557object *
1558maptile::pick_random_object (rand_gen &gen) const
1559{
1560 /* while returning a null object will result in a crash, that
1561 * is actually preferable to an infinite loop. That is because
1562 * most servers will automatically restart in case of crash.
1563 * Change the logic on getting the random space - shouldn't make
1564 * any difference, but this seems clearer to me.
1565 */
1566 for (int i = 1000; --i;)
1567 {
1568 object *pick = at (gen (width), gen (height)).bot;
1569
1570 // do not prefer big monsters just because they are big.
1571 if (pick && pick->is_head ())
1572 return pick->head_ ();
1573 }
1574
1575 // instead of crashing in the unlikely(?) case, try to return *something*
1576 return archetype::find (shstr_bug);
1577}
1578
1579//-GPL
1580
1581void
1582maptile::play_sound (faceidx sound, int x, int y) const
1583{
1584 if (!sound)
1585 return;
1586
1587 for_all_players_on_map (pl, this)
1588 if (client *ns = pl->ns)
1589 {
1590 int dx = x - pl->ob->x;
1591 int dy = y - pl->ob->y;
1592
1593 int distance = idistance (dx, dy);
1594
1595 if (distance <= MAX_SOUND_DISTANCE)
1596 ns->play_sound (sound, dx, dy);
1597 }
1598}
1599
1600void
1601maptile::say_msg (const char *msg, int x, int y) const
1602{
1603 for_all_players (pl)
1604 if (client *ns = pl->ns)
1605 {
1606 int dx = x - pl->ob->x;
1607 int dy = y - pl->ob->y;
1608
1609 int distance = idistance (dx, dy);
1610
1611 if (distance <= MAX_SOUND_DISTANCE)
1612 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1613 }
1614}
1615
1616static void
1617split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1618{
1619 // clip to map to the left
1620 if (x0 < 0)
1621 {
1622 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1623 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1624
1625 if (x1 < 0) // entirely to the left
1626 return;
1627
1628 x0 = 0;
1629 }
1630
1631 // clip to map to the right
1632 if (x1 > m->width)
1633 {
1634 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1635 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1636
1637 if (x0 > m->width) // entirely to the right
1638 return;
1639
1640 x1 = m->width;
1641 }
1642
1643 // clip to map above
1644 if (y0 < 0)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_UP, 1))
1647 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1648
1649 if (y1 < 0) // entirely above
1650 return;
1651
1652 y0 = 0;
1653 }
1654
1655 // clip to map below
1656 if (y1 > m->height)
1657 {
1658 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1659 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1660
1661 if (y0 > m->height) // entirely below
1662 return;
1663
1664 y1 = m->height;
1665 }
1666
1667 // if we get here, the rect is within the current map
1668 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1669
1670 r->m = m;
1671 r->x0 = x0;
1672 r->y0 = y0;
1673 r->x1 = x1;
1674 r->y1 = y1;
1675 r->dx = dx;
1676 r->dy = dy;
1677}
1678
1679maprect *
1680maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1681{
1682 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1683 buf.clear ();
1684
1685 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1686
1687 // add end marker
1688 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1689 r->m = 0;
1690
1691 return (maprect *)buf.linearise ();
1692}
1693

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines