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.88 by root, Fri Feb 16 19:43:40 2007 UTC vs.
Revision 1.152 by root, Tue Dec 23 01:51:27 2008 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <unistd.h> 24#include <unistd.h>
26 25
27#include "global.h" 26#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h" 27#include "loader.h"
31
32#include "path.h" 28#include "path.h"
33 29
34/* 30sint8 maptile::outdoor_darkness;
35 * This makes a path absolute outside the world of Crossfire.
36 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
37 * and returns the pointer to a static array containing the result.
38 * it really should be called create_mapname
39 */
40const char *
41create_pathname (const char *name)
42{
43 static char buf[8192];
44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
45 return buf;
46}
47
48/*
49 * This function checks if a file with the given path exists.
50 * -1 is returned if it fails, otherwise the mode of the file
51 * is returned.
52 * It tries out all the compression suffixes listed in the uncomp[] array.
53 *
54 * If prepend_dir is set, then we call create_pathname (which prepends
55 * libdir & mapdir). Otherwise, we assume the name given is fully
56 * complete.
57 * Only the editor actually cares about the writablity of this -
58 * the rest of the code only cares that the file is readable.
59 * when the editor goes away, the call to stat should probably be
60 * replaced by an access instead (similar to the windows one, but
61 * that seems to be missing the prepend_dir processing
62 */
63int
64check_path (const char *name, int prepend_dir)
65{
66 char buf[MAX_BUF];
67
68 char *endbuf;
69 struct stat statbuf;
70 int mode = 0;
71
72 if (prepend_dir)
73 assign (buf, create_pathname (name));
74 else
75 assign (buf, name);
76
77 /* old method (strchr(buf, '\0')) seemd very odd to me -
78 * this method should be equivalant and is clearer.
79 * Can not use strcat because we need to cycle through
80 * all the names.
81 */
82 endbuf = buf + strlen (buf);
83
84 if (stat (buf, &statbuf))
85 return -1;
86 if (!S_ISREG (statbuf.st_mode))
87 return (-1);
88
89 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
90 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
91 mode |= 4;
92
93 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
94 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
95 mode |= 2;
96
97 return (mode);
98}
99 31
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 32/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 33 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 34 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 35 * new values into newmap, nx, and ny. Any and all of those
… …
174 * let the player through (inventory checkers for example) 106 * let the player through (inventory checkers for example)
175 */ 107 */
176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 108 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177 return 0; 109 return 0;
178 110
179 if (ob->head != NULL)
180 ob = ob->head; 111 ob = ob->head_ ();
181 112
182 /* We basically go through the stack of objects, and if there is 113 /* We basically go through the stack of objects, and if there is
183 * some other object that has NO_PASS or FLAG_ALIVE set, return 114 * some other object that has NO_PASS or FLAG_ALIVE set, return
184 * true. If we get through the entire stack, that must mean 115 * true. If we get through the entire stack, that must mean
185 * ob is blocking it, so return 0. 116 * ob is blocking it, so return 0.
… …
215 else 146 else
216 { 147 {
217 /* Broke apart a big nasty if into several here to make 148 /* Broke apart a big nasty if into several here to make
218 * this more readable. first check - if the space blocks 149 * this more readable. first check - if the space blocks
219 * movement, can't move here. 150 * movement, can't move here.
220 * second - if a monster, can't move there, unles it is a 151 * second - if a monster, can't move there, unless it is a
221 * hidden dm 152 * hidden dm
222 */ 153 */
223 if (OB_MOVE_BLOCK (ob, tmp)) 154 if (OB_MOVE_BLOCK (ob, tmp))
224 return 1; 155 return 1;
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 156
226 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 157 if (tmp->flag [FLAG_ALIVE]
158 && tmp->head_ () != ob
159 && tmp != ob
160 && tmp->type != DOOR
161 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
227 return 1; 162 return 1;
228 } 163 }
229 164
230 } 165 }
231 return 0; 166 return 0;
232} 167}
233 168
234/* 169/*
235 * Returns true if the given object can't fit in the given spot. 170 * Returns qthe blocking object if the given object can't fit in the given
236 * This is meant for multi space objects - for single space objecs, 171 * spot. This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
239 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
240 * 175 *
241 * While this doesn't call out of map, the get_map_flags does. 176 * While this doesn't call out of map, the get_map_flags does.
242 * 177 *
243 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
244 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
255 * 190 *
256 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
257 * code, we need to have actual object to check its move_type 192 * code, we need to have actual object to check its move_type
258 * against the move_block values. 193 * against the move_block values.
259 */ 194 */
260int 195bool
261ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
262{ 197{
263 archetype *tmp; 198 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
264 int flag;
265 maptile *m1;
266 sint16 sx, sy;
267
268 if (!ob)
269 {
270 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
271 if (flag & P_OUT_OF_MAP)
272 return P_OUT_OF_MAP;
273
274 /* don't have object, so don't know what types would block */
275 return m1->at (sx, sy).move_block;
276 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
277 201
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 202 if (!pos.normalise ())
279 { 203 return 1;
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281 204
282 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
283 return P_OUT_OF_MAP; 206
284 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
285 return P_IS_ALIVE; 208 return 1;
286 209
287 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
288 211 * (signifying non-moving objects)
289 /* find_first_free_spot() calls this function. However, often
290 * ob doesn't have any move type (when used to place exits)
291 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 212 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
292 */ 213 */
293
294 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
295 continue; 215 continue;
296 216
297 /* Note it is intentional that we check ob - the movement type of the 217 /* Note it is intentional that we check ob - the movement type of the
298 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
299 */ 219 */
300 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
301 return P_NO_PASS; 221 return 1;
302 } 222 }
303 223
304 return 0; 224 return 0;
305} 225}
306 226
… …
324 244
325 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
326 tmp = next; 246 tmp = next;
327 } 247 }
328 248
329 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
330 * carrying. 250 //TODO: remove
331 */ 251 container->update_weight ();
332 sum_weight (container);
333} 252}
334 253
335void 254void
336maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
337{ 256{
… …
341 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 260 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 261 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value; 262 tmp->flag [flag] = value;
344} 263}
345 264
265void
266maptile::post_load_original ()
267{
268 if (!spaces)
269 return;
270
271 set_object_flag (FLAG_OBJ_ORIGINAL);
272
273 for (mapspace *ms = spaces + size (); ms-- > spaces; )
274 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
275 INVOKE_OBJECT (RESET, tmp);
276}
277
346/* link_multipart_objects go through all the objects on the map looking 278/* link_multipart_objects go through all the objects on the map looking
347 * for objects whose arch says they are multipart yet according to the 279 * for objects whose arch says they are multipart yet according to the
348 * info we have, they only have the head (as would be expected when 280 * info we have, they only have the head (as would be expected when
349 * they are saved). We do have to look for the old maps that did save 281 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 282 */
352void 283void
353maptile::link_multipart_objects () 284maptile::link_multipart_objects ()
354{ 285{
355 if (!spaces) 286 if (!spaces)
356 return; 287 return;
357 288
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 289 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; ) 290 {
291 object *op = ms->bot;
292 while (op)
360 { 293 {
361 object *above = tmp->above;
362
363 /* already multipart - don't do anything more */ 294 /* already multipart - don't do anything more */
364 if (!tmp->head && !tmp->more) 295 if (op->head_ () == op && !op->more && op->arch->more)
365 {
366 /* If there is nothing more to this object, this for loop
367 * won't do anything.
368 */
369 archetype *at;
370 object *last, *op;
371 for (at = tmp->arch->more, last = tmp;
372 at;
373 at = at->more, last = op)
374 { 296 {
375 op = arch_to_object (at); 297 op->remove ();
298 op->expand_tail ();
376 299
377 /* update x,y coordinates */ 300 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
378 op->x += tmp->x; 301 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
379 op->y += tmp->y; 302 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
380 op->head = tmp;
381 op->map = this;
382 last->more = op;
383 op->name = tmp->name;
384 op->title = tmp->title;
385
386 /* we could link all the parts onto tmp, and then just
387 * call insert_ob_in_map once, but the effect is the same,
388 * as insert_ob_in_map will call itself with each part, and
389 * the coding is simpler to just to it here with each part.
390 */
391 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 303 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
304
305 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
306 // so we have to reset the iteration through the mapspace
392 } 307 }
308 else
309 op = op->above;
393 } 310 }
394
395 tmp = above;
396 } 311 }
397} 312}
398 313
399/* 314/*
400 * Loads (ands parses) the objects into a given map from the specified 315 * Loads (ands parses) the objects into a given map from the specified
401 * file pointer. 316 * file pointer.
… …
403bool 318bool
404maptile::_load_objects (object_thawer &f) 319maptile::_load_objects (object_thawer &f)
405{ 320{
406 for (;;) 321 for (;;)
407 { 322 {
408 coroapi::cede_every (1000); // cede once in a while 323 coroapi::cede_to_tick (); // cede once in a while
409 324
410 switch (f.kw) 325 switch (f.kw)
411 { 326 {
412 case KW_arch: 327 case KW_arch:
413 if (object *op = object::read (f)) 328 if (object *op = object::read (f, this))
414 { 329 {
330 // TODO: why?
415 if (op->inv) 331 if (op->inv)
416 sum_weight (op); 332 op->update_weight ();
417 333
418 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 334 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
335 {
336 // we insert manually because
337 // a) its way faster
338 // b) we remove manually, too, and there are good reasons for that
339 // c) its correct
340 mapspace &ms = at (op->x, op->y);
341
342 op->flag [FLAG_REMOVED] = false;
343
344 op->above = 0;
345 op->below = ms.top;
346
347 if (ms.top)
348 ms.top->above = op;
349 else
350 ms.bot = op;
351
352 ms.top = op;
353 ms.flags_ = 0;
354 }
355 else
356 {
357 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
358 op->destroy ();
359 }
419 } 360 }
420 361
421 continue; 362 continue;
422 363
423 case KW_EOF: 364 case KW_EOF:
… …
436} 377}
437 378
438void 379void
439maptile::activate () 380maptile::activate ()
440{ 381{
441 if (!spaces) 382 if (spaces)
442 return;
443
444 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 383 for (mapspace *ms = spaces + size (); ms-- > spaces; )
445 for (object *op = ms->bot; op; op = op->above) 384 for (object *op = ms->bot; op; op = op->above)
446 op->activate_recursive (); 385 op->activate_recursive ();
447} 386}
448 387
449void 388void
450maptile::deactivate () 389maptile::deactivate ()
451{ 390{
452 if (!spaces) 391 if (spaces)
453 return;
454
455 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 392 for (mapspace *ms = spaces + size (); ms-- > spaces; )
456 for (object *op = ms->bot; op; op = op->above) 393 for (object *op = ms->bot; op; op = op->above)
457 op->deactivate_recursive (); 394 op->deactivate_recursive ();
458} 395}
459 396
460bool 397bool
461maptile::_save_objects (object_freezer &f, int flags) 398maptile::_save_objects (object_freezer &f, int flags)
462{ 399{
463 static int cede_count = 0; 400 coroapi::cede_to_tick ();
464 401
465 if (flags & IO_HEADER) 402 if (flags & IO_HEADER)
466 _save_header (f); 403 _save_header (f);
467 404
468 if (!spaces) 405 if (!spaces)
469 return false; 406 return false;
470 407
471 for (int i = 0; i < size (); ++i) 408 for (int i = 0; i < size (); ++i)
472 { 409 {
473#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
474 if (cede_count >= 500)
475 {
476 cede_count = 0;
477 coroapi::cede ();
478 }
479#endif
480
481 int unique = 0; 410 bool unique = 0;
411
482 for (object *op = spaces [i].bot; op; op = op->above) 412 for (object *op = spaces [i].bot; op; op = op->above)
483 { 413 {
484 // count per-object, but cede only when modification-safe
485 cede_count++;
486
487 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 414 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
488 unique = 1;
489 415
490 if (!op->can_map_save ()) 416 if (expect_false (!op->can_map_save ()))
491 continue; 417 continue;
492 418
493 if (unique || op->flag [FLAG_UNIQUE]) 419 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
494 { 420 {
495 if (flags & IO_UNIQUES) 421 if (flags & IO_UNIQUES)
496 op->write (f); 422 op->write (f);
497 } 423 }
498 else if (flags & IO_OBJECTS) 424 else if (expect_true (flags & IO_OBJECTS))
499 op->write (f); 425 op->write (f);
500 } 426 }
501 } 427 }
502 428
429 coroapi::cede_to_tick ();
430
503 return true; 431 return true;
504}
505
506bool
507maptile::_load_objects (const char *path, bool skip_header)
508{
509 object_thawer f (path);
510
511 if (!f)
512 return false;
513
514 f.next ();
515
516 if (skip_header)
517 for (;;)
518 {
519 keyword kw = f.kw;
520 f.skip ();
521 if (kw == KW_end)
522 break;
523 }
524
525 return _load_objects (f);
526} 432}
527 433
528bool 434bool
529maptile::_save_objects (const char *path, int flags) 435maptile::_save_objects (const char *path, int flags)
530{ 436{
… …
705bool 611bool
706maptile::_load_header (object_thawer &thawer) 612maptile::_load_header (object_thawer &thawer)
707{ 613{
708 for (;;) 614 for (;;)
709 { 615 {
710 keyword kw = thawer.get_kv ();
711
712 switch (kw) 616 switch (thawer.kw)
713 { 617 {
714 case KW_msg: 618 case KW_msg:
715 thawer.get_ml (KW_endmsg, msg); 619 thawer.get_ml (KW_endmsg, msg);
716 break; 620 break;
717 621
… …
749 case KW_winddir: thawer.get (winddir); break; 653 case KW_winddir: thawer.get (winddir); break;
750 case KW_sky: thawer.get (sky); break; 654 case KW_sky: thawer.get (sky); break;
751 655
752 case KW_per_player: thawer.get (per_player); break; 656 case KW_per_player: thawer.get (per_player); break;
753 case KW_per_party: thawer.get (per_party); break; 657 case KW_per_party: thawer.get (per_party); break;
658 case KW_no_reset: thawer.get (no_reset); break;
659 case KW_no_drop: thawer.get (no_drop); break;
754 660
755 case KW_region: default_region = region::find (thawer.get_str ()); break; 661 case KW_region: default_region = region::find (thawer.get_str ()); break;
756 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 662 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
757 663
758 // old names new names 664 // old names new names
… …
769 case KW_tile_path_1: thawer.get (tile_path [0]); break; 675 case KW_tile_path_1: thawer.get (tile_path [0]); break;
770 case KW_tile_path_2: thawer.get (tile_path [1]); break; 676 case KW_tile_path_2: thawer.get (tile_path [1]); break;
771 case KW_tile_path_3: thawer.get (tile_path [2]); break; 677 case KW_tile_path_3: thawer.get (tile_path [2]); break;
772 case KW_tile_path_4: thawer.get (tile_path [3]); break; 678 case KW_tile_path_4: thawer.get (tile_path [3]); break;
773 679
680 case KW_ERROR:
681 set_key_text (thawer.kw_str, thawer.value);
682 break;
683
774 case KW_end: 684 case KW_end:
685 thawer.next ();
775 return true; 686 return true;
776 687
777 default: 688 default:
778 if (!thawer.parse_error ("map", 0)) 689 if (!thawer.parse_error ("map", 0))
779 return false; 690 return false;
780 break; 691 break;
781 } 692 }
693
694 thawer.next ();
782 } 695 }
783 696
784 abort (); 697 abort ();
785}
786
787bool
788maptile::_load_header (const char *path)
789{
790 object_thawer thawer (path);
791
792 if (!thawer)
793 return false;
794
795 return _load_header (thawer);
796} 698}
797 699
798/****************************************************************************** 700/******************************************************************************
799 * This is the start of unique map handling code 701 * This is the start of unique map handling code
800 *****************************************************************************/ 702 *****************************************************************************/
… …
811 object *above = op->above; 713 object *above = op->above;
812 714
813 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 715 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
814 unique = 1; 716 unique = 1;
815 717
816 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 718 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
817 {
818 op->destroy_inv (false);
819 op->destroy (); 719 op->destroy ();
820 }
821 720
822 op = above; 721 op = above;
823 } 722 }
824 } 723 }
825} 724}
… …
835 if (name) MAP_OUT (name); 734 if (name) MAP_OUT (name);
836 MAP_OUT (swap_time); 735 MAP_OUT (swap_time);
837 MAP_OUT (reset_time); 736 MAP_OUT (reset_time);
838 MAP_OUT (reset_timeout); 737 MAP_OUT (reset_timeout);
839 MAP_OUT (fixed_resettime); 738 MAP_OUT (fixed_resettime);
739 MAP_OUT (no_reset);
740 MAP_OUT (no_drop);
840 MAP_OUT (difficulty); 741 MAP_OUT (difficulty);
841 742
842 if (default_region) MAP_OUT2 (region, default_region->name); 743 if (default_region) MAP_OUT2 (region, default_region->name);
843 744
844 if (shopitems) 745 if (shopitems)
… …
898 * Remove and free all objects in the given map. 799 * Remove and free all objects in the given map.
899 */ 800 */
900void 801void
901maptile::clear () 802maptile::clear ()
902{ 803{
903 sfree (regions, size ()), regions = 0;
904 free (regionmap), regionmap = 0;
905
906 if (spaces) 804 if (spaces)
907 { 805 {
908 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 806 for (mapspace *ms = spaces + size (); ms-- > spaces; )
909 while (object *op = ms->bot) 807 while (object *op = ms->bot)
910 { 808 {
809 // manually remove, as to not trigger anything
810 if (ms->bot = op->above)
811 ms->bot->below = 0;
812
813 op->flag [FLAG_REMOVED] = true;
814
815 object *head = op->head_ ();
911 if (op->head) 816 if (op == head)
912 op = op->head;
913
914 op->destroy_inv (false);
915 op->destroy (); 817 op->destroy ();
818 else if (head->map != op->map)
819 {
820 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
821 head->destroy ();
822 }
916 } 823 }
917 824
918 sfree (spaces, size ()), spaces = 0; 825 sfree0 (spaces, size ());
919 } 826 }
920 827
921 if (buttons) 828 if (buttons)
922 free_objectlinkpt (buttons), buttons = 0; 829 free_objectlinkpt (buttons), buttons = 0;
830
831 sfree0 (regions, size ());
832 delete [] regionmap; regionmap = 0;
923} 833}
924 834
925void 835void
926maptile::clear_header () 836maptile::clear_header ()
927{ 837{
… …
957maptile::do_destroy () 867maptile::do_destroy ()
958{ 868{
959 attachable::do_destroy (); 869 attachable::do_destroy ();
960 870
961 clear (); 871 clear ();
872}
873
874/* decay and destroy perishable items in a map */
875void
876maptile::do_decay_objects ()
877{
878 if (!spaces)
879 return;
880
881 for (mapspace *ms = spaces + size (); ms-- > spaces; )
882 for (object *above, *op = ms->bot; op; op = above)
883 {
884 above = op->above;
885
886 bool destroy = 0;
887
888 // do not decay anything above unique floor tiles (yet :)
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890 break;
891
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_UNIQUE)
895 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
896 || QUERY_FLAG (op, FLAG_UNPAID)
897 || op->is_alive ())
898 ; // do not decay
899 else if (op->is_weapon ())
900 {
901 op->stats.dam--;
902 if (op->stats.dam < 0)
903 destroy = 1;
904 }
905 else if (op->is_armor ())
906 {
907 op->stats.ac--;
908 if (op->stats.ac < 0)
909 destroy = 1;
910 }
911 else if (op->type == FOOD)
912 {
913 op->stats.food -= rndm (5, 20);
914 if (op->stats.food < 0)
915 destroy = 1;
916 }
917 else
918 {
919 int mat = op->materials;
920
921 if (mat & M_PAPER
922 || mat & M_LEATHER
923 || mat & M_WOOD
924 || mat & M_ORGANIC
925 || mat & M_CLOTH
926 || mat & M_LIQUID
927 || (mat & M_IRON && rndm (1, 5) == 1)
928 || (mat & M_GLASS && rndm (1, 2) == 1)
929 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
930 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
931 || (mat & M_ICE && temp > 32))
932 destroy = 1;
933 }
934
935 /* adjust overall chance below */
936 if (destroy && rndm (0, 1))
937 op->destroy ();
938 }
962} 939}
963 940
964/* 941/*
965 * Updates every button on the map (by calling update_button() for them). 942 * Updates every button on the map (by calling update_button() for them).
966 */ 943 */
… …
1013 990
1014 if (QUERY_FLAG (op, FLAG_GENERATOR)) 991 if (QUERY_FLAG (op, FLAG_GENERATOR))
1015 { 992 {
1016 total_exp += op->stats.exp; 993 total_exp += op->stats.exp;
1017 994
1018 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 995 if (archetype *at = op->other_arch)
996 {
1019 total_exp += at->clone.stats.exp * 8; 997 total_exp += at->stats.exp * 8;
1020
1021 monster_cnt++; 998 monster_cnt++;
999 }
1000
1001 for (object *inv = op->inv; inv; inv = inv->below)
1002 {
1003 total_exp += op->stats.exp * 8;
1004 monster_cnt++;
1005 }
1022 } 1006 }
1023 } 1007 }
1024 1008
1025 avgexp = (double) total_exp / monster_cnt; 1009 avgexp = (double) total_exp / monster_cnt;
1026 1010
… …
1065 else 1049 else
1066 darkness = new_level; 1050 darkness = new_level;
1067 1051
1068 /* All clients need to get re-updated for the change */ 1052 /* All clients need to get re-updated for the change */
1069 update_all_map_los (this); 1053 update_all_map_los (this);
1054
1070 return 1; 1055 return 1;
1071} 1056}
1072 1057
1073/* 1058/*
1074 * This function updates various attributes about a specific space 1059 * This function updates various attributes about a specific space
… …
1077 * through, etc) 1062 * through, etc)
1078 */ 1063 */
1079void 1064void
1080mapspace::update_ () 1065mapspace::update_ ()
1081{ 1066{
1082 object *tmp, *last = 0; 1067 object *last = 0;
1083 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1068 uint8 flags = P_UPTODATE, anywhere = 0;
1084 facetile *top, *floor, *middle; 1069 sint8 light = 0;
1085 object *top_obj, *floor_obj, *middle_obj;
1086 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1070 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1087 1071
1088 middle = blank_face; 1072 //object *middle = 0;
1089 top = blank_face; 1073 //object *top = 0;
1090 floor = blank_face; 1074 //object *floor = 0;
1075 // this seems to generate better code than using locals, above
1076 object *&top = faces_obj[0] = 0;
1077 object *&middle = faces_obj[1] = 0;
1078 object *&floor = faces_obj[2] = 0;
1091 1079
1092 middle_obj = 0;
1093 top_obj = 0;
1094 floor_obj = 0;
1095
1096 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1080 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1097 { 1081 {
1098 /* This could be made additive I guess (two lights better than 1082 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1099 * one). But if so, it shouldn't be a simple additive - 2
1100 * light bulbs do not illuminate twice as far as once since
1101 * it is a dissapation factor that is cubed.
1102 */
1103 if (tmp->glow_radius > light)
1104 light = tmp->glow_radius; 1083 light += tmp->glow_radius;
1105 1084
1106 /* This call is needed in order to update objects the player 1085 /* This call is needed in order to update objects the player
1107 * is standing in that have animations (ie, grass, fire, etc). 1086 * is standing in that have animations (ie, grass, fire, etc).
1108 * However, it also causes the look window to be re-drawn 1087 * However, it also causes the look window to be re-drawn
1109 * 3 times each time the player moves, because many of the 1088 * 3 times each time the player moves, because many of the
… …
1112 * Always put the player down for drawing. 1091 * Always put the player down for drawing.
1113 */ 1092 */
1114 if (!tmp->invisible) 1093 if (!tmp->invisible)
1115 { 1094 {
1116 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1095 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1117 {
1118 top = tmp->face;
1119 top_obj = tmp; 1096 top = tmp;
1120 }
1121 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1097 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1122 { 1098 {
1123 /* If we got a floor, that means middle and top were below it, 1099 /* If we got a floor, that means middle and top were below it,
1124 * so should not be visible, so we clear them. 1100 * so should not be visible, so we clear them.
1125 */ 1101 */
1126 middle = blank_face; 1102 middle = 0;
1127 top = blank_face; 1103 top = 0;
1128 floor = tmp->face;
1129 floor_obj = tmp; 1104 floor = tmp;
1130 } 1105 }
1131 /* Flag anywhere have high priority */ 1106 /* Flag anywhere have high priority */
1132 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1107 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1133 { 1108 {
1134 middle = tmp->face;
1135
1136 middle_obj = tmp; 1109 middle = tmp;
1137 anywhere = 1; 1110 anywhere = 1;
1138 } 1111 }
1112
1139 /* Find the highest visible face around. If equal 1113 /* Find the highest visible face around. If equal
1140 * visibilities, we still want the one nearer to the 1114 * visibilities, we still want the one nearer to the
1141 * top 1115 * top
1142 */ 1116 */
1143 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1117 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1144 {
1145 middle = tmp->face;
1146 middle_obj = tmp; 1118 middle = tmp;
1147 }
1148 } 1119 }
1149 1120
1150 if (tmp == tmp->above) 1121 if (tmp == tmp->above)
1151 { 1122 {
1152 LOG (llevError, "Error in structure of map\n"); 1123 LOG (llevError, "Error in structure of map\n");
… …
1165 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1136 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1166 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1137 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1167 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1138 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1168 } 1139 }
1169 1140
1170 this->light = light; 1141 this->light = min (light, MAX_LIGHT_RADIUS);
1171 this->flags_ = flags; 1142 this->flags_ = flags;
1172 this->move_block = move_block & ~move_allow; 1143 this->move_block = move_block & ~move_allow;
1173 this->move_on = move_on; 1144 this->move_on = move_on;
1174 this->move_off = move_off; 1145 this->move_off = move_off;
1175 this->move_slow = move_slow; 1146 this->move_slow = move_slow;
… …
1187 * middle face. This should not happen, as we already have the 1158 * middle face. This should not happen, as we already have the
1188 * else statement above so middle should not get set. OTOH, it 1159 * else statement above so middle should not get set. OTOH, it
1189 * may be possible for the faces to match but be different objects. 1160 * may be possible for the faces to match but be different objects.
1190 */ 1161 */
1191 if (top == middle) 1162 if (top == middle)
1192 middle = blank_face; 1163 middle = 0;
1193 1164
1194 /* There are three posibilities at this point: 1165 /* There are three posibilities at this point:
1195 * 1) top face is set, need middle to be set. 1166 * 1) top face is set, need middle to be set.
1196 * 2) middle is set, need to set top. 1167 * 2) middle is set, need to set top.
1197 * 3) neither middle or top is set - need to set both. 1168 * 3) neither middle or top is set - need to set both.
1198 */ 1169 */
1199 1170
1200 for (tmp = last; tmp; tmp = tmp->below) 1171 for (object *tmp = last; tmp; tmp = tmp->below)
1201 { 1172 {
1202 /* Once we get to a floor, stop, since we already have a floor object */ 1173 /* Once we get to a floor, stop, since we already have a floor object */
1203 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1174 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1204 break; 1175 break;
1205 1176
1206 /* If two top faces are already set, quit processing */ 1177 /* If two top faces are already set, quit processing */
1207 if ((top != blank_face) && (middle != blank_face)) 1178 if (top && middle)
1208 break; 1179 break;
1209 1180
1210 /* Only show visible faces */ 1181 /* Only show visible faces */
1211 if (!tmp->invisible) 1182 if (!tmp->invisible)
1212 { 1183 {
1213 /* Fill in top if needed */ 1184 /* Fill in top if needed */
1214 if (top == blank_face) 1185 if (!top)
1215 { 1186 {
1216 top = tmp->face;
1217 top_obj = tmp; 1187 top = tmp;
1218 if (top == middle) 1188 if (top == middle)
1219 middle = blank_face; 1189 middle = 0;
1220 } 1190 }
1221 else 1191 else
1222 { 1192 {
1223 /* top is already set - we should only get here if 1193 /* top is already set - we should only get here if
1224 * middle is not set 1194 * middle is not set
1225 * 1195 *
1226 * Set the middle face and break out, since there is nothing 1196 * Set the middle face and break out, since there is nothing
1227 * more to fill in. We don't check visiblity here, since 1197 * more to fill in. We don't check visiblity here, since
1228 * 1198 *
1229 */ 1199 */
1230 if (tmp->face != top) 1200 if (tmp != top)
1231 { 1201 {
1232 middle = tmp->face;
1233 middle_obj = tmp; 1202 middle = tmp;
1234 break; 1203 break;
1235 } 1204 }
1236 } 1205 }
1237 } 1206 }
1238 } 1207 }
1239 1208
1240 if (middle == floor) 1209 if (middle == floor)
1241 middle = blank_face; 1210 middle = 0;
1242 1211
1243 if (top == middle) 1212 if (top == middle)
1244 middle = blank_face; 1213 middle = 0;
1245 1214
1246 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1215#if 0
1247 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1216 faces_obj [0] = top;
1248 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1217 faces_obj [1] = middle;
1218 faces_obj [2] = floor;
1219#endif
1249} 1220}
1250 1221
1251uint64 1222uint64
1252mapspace::volume () const 1223mapspace::volume () const
1253{ 1224{
… …
1257 vol += op->volume (); 1228 vol += op->volume ();
1258 1229
1259 return vol; 1230 return vol;
1260} 1231}
1261 1232
1262/* this updates the orig_map->tile_map[tile_num] value after finding 1233bool
1263 * the map. It also takes care of linking back the freshly found 1234maptile::tile_available (int dir, bool load)
1264 * maps tile_map values if it tiles back to this one. It returns
1265 * the value of orig_map->tile_map[tile_num].
1266 */
1267static inline maptile *
1268find_and_link (maptile *orig_map, int tile_num)
1269{ 1235{
1270 maptile *mp = orig_map->tile_map [tile_num]; 1236 if (!tile_path[dir])
1237 return 0;
1271 1238
1272 if (!mp) 1239 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1273 { 1240 return 1;
1274 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1275 1241
1276 if (!mp) 1242 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1277 { 1243 return 1;
1278 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1279 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1280 &orig_map->tile_path[tile_num], &orig_map->path);
1281 mp = new maptile (1, 1);
1282 mp->alloc ();
1283 mp->in_memory = MAP_IN_MEMORY;
1284 }
1285 }
1286 1244
1287 int dest_tile = (tile_num + 2) % 4;
1288
1289 orig_map->tile_map [tile_num] = mp;
1290
1291 // optimisation: back-link map to origin map if euclidean
1292 //TODO: non-euclidean maps MUST GO
1293 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1294 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1295
1296 return mp; 1245 return 0;
1297}
1298
1299static inline void
1300load_and_link (maptile *orig_map, int tile_num)
1301{
1302 find_and_link (orig_map, tile_num)->load_sync ();
1303} 1246}
1304 1247
1305/* this returns TRUE if the coordinates (x,y) are out of 1248/* this returns TRUE if the coordinates (x,y) are out of
1306 * map m. This function also takes into account any 1249 * map m. This function also takes into account any
1307 * tiling considerations, loading adjacant maps as needed. 1250 * tiling considerations, loading adjacant maps as needed.
… …
1320 if (!m) 1263 if (!m)
1321 return 0; 1264 return 0;
1322 1265
1323 if (x < 0) 1266 if (x < 0)
1324 { 1267 {
1325 if (!m->tile_path[3]) 1268 if (!m->tile_available (3))
1326 return 1; 1269 return 1;
1327 1270
1328 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1329 find_and_link (m, 3);
1330
1331 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1271 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1332 } 1272 }
1333 1273
1334 if (x >= m->width) 1274 if (x >= m->width)
1335 { 1275 {
1336 if (!m->tile_path[1]) 1276 if (!m->tile_available (1))
1337 return 1; 1277 return 1;
1338 1278
1339 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1340 find_and_link (m, 1);
1341
1342 return out_of_map (m->tile_map[1], x - m->width, y); 1279 return out_of_map (m->tile_map[1], x - m->width, y);
1343 } 1280 }
1344 1281
1345 if (y < 0) 1282 if (y < 0)
1346 { 1283 {
1347 if (!m->tile_path[0]) 1284 if (!m->tile_available (0))
1348 return 1; 1285 return 1;
1349 1286
1350 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1351 find_and_link (m, 0);
1352
1353 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1287 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1354 } 1288 }
1355 1289
1356 if (y >= m->height) 1290 if (y >= m->height)
1357 { 1291 {
1358 if (!m->tile_path[2]) 1292 if (!m->tile_available (2))
1359 return 1; 1293 return 1;
1360
1361 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1362 find_and_link (m, 2);
1363 1294
1364 return out_of_map (m->tile_map[2], x, y - m->height); 1295 return out_of_map (m->tile_map[2], x, y - m->height);
1365 } 1296 }
1366 1297
1367 /* Simple case - coordinates are within this local 1298 /* Simple case - coordinates are within this local
… …
1381maptile * 1312maptile *
1382maptile::xy_find (sint16 &x, sint16 &y) 1313maptile::xy_find (sint16 &x, sint16 &y)
1383{ 1314{
1384 if (x < 0) 1315 if (x < 0)
1385 { 1316 {
1386 if (!tile_path[3]) 1317 if (!tile_available (3))
1387 return 0; 1318 return 0;
1388 1319
1389 find_and_link (this, 3);
1390 x += tile_map[3]->width; 1320 x += tile_map[3]->width;
1391 return tile_map[3]->xy_find (x, y); 1321 return tile_map[3]->xy_find (x, y);
1392 } 1322 }
1393 1323
1394 if (x >= width) 1324 if (x >= width)
1395 { 1325 {
1396 if (!tile_path[1]) 1326 if (!tile_available (1))
1397 return 0; 1327 return 0;
1398 1328
1399 find_and_link (this, 1);
1400 x -= width; 1329 x -= width;
1401 return tile_map[1]->xy_find (x, y); 1330 return tile_map[1]->xy_find (x, y);
1402 } 1331 }
1403 1332
1404 if (y < 0) 1333 if (y < 0)
1405 { 1334 {
1406 if (!tile_path[0]) 1335 if (!tile_available (0))
1407 return 0; 1336 return 0;
1408 1337
1409 find_and_link (this, 0);
1410 y += tile_map[0]->height; 1338 y += tile_map[0]->height;
1411 return tile_map[0]->xy_find (x, y); 1339 return tile_map[0]->xy_find (x, y);
1412 } 1340 }
1413 1341
1414 if (y >= height) 1342 if (y >= height)
1415 { 1343 {
1416 if (!tile_path[2]) 1344 if (!tile_available (2))
1417 return 0; 1345 return 0;
1418 1346
1419 find_and_link (this, 2);
1420 y -= height; 1347 y -= height;
1421 return tile_map[2]->xy_find (x, y); 1348 return tile_map[2]->xy_find (x, y);
1422 } 1349 }
1423 1350
1424 /* Simple case - coordinates are within this local 1351 /* Simple case - coordinates are within this local
… …
1435adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1362adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1436{ 1363{
1437 if (!map1 || !map2) 1364 if (!map1 || !map2)
1438 return 0; 1365 return 0;
1439 1366
1440 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1367 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1441 //fix: compare paths instead (this is likely faster, too!) 1368 //fix: compare paths instead (this is likely faster, too!)
1442 if (map1 == map2) 1369 if (map1 == map2)
1443 { 1370 {
1444 *dx = 0; 1371 *dx = 0;
1445 *dy = 0; 1372 *dy = 0;
… …
1652} 1579}
1653 1580
1654object * 1581object *
1655maptile::insert (object *op, int x, int y, object *originator, int flags) 1582maptile::insert (object *op, int x, int y, object *originator, int flags)
1656{ 1583{
1657 if (!op->flag [FLAG_REMOVED])
1658 op->remove ();
1659
1660 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1584 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1661} 1585}
1662 1586
1663region * 1587region *
1664maptile::region (int x, int y) const 1588maptile::region (int x, int y) const
… …
1673 return default_region; 1597 return default_region;
1674 1598
1675 return ::region::default_region (); 1599 return ::region::default_region ();
1676} 1600}
1677 1601
1602/* picks a random object from a style map.
1603 */
1604object *
1605maptile::pick_random_object (rand_gen &gen) const
1606{
1607 /* while returning a null object will result in a crash, that
1608 * is actually preferable to an infinite loop. That is because
1609 * most servers will automatically restart in case of crash.
1610 * Change the logic on getting the random space - shouldn't make
1611 * any difference, but this seems clearer to me.
1612 */
1613 for (int i = 1000; --i;)
1614 {
1615 object *pick = at (gen (width), gen (height)).bot;
1678 1616
1617 // do not prefer big monsters just because they are big.
1618 if (pick && pick->is_head ())
1619 return pick->head_ ();
1620 }
1621
1622 // instead of crashing in the unlikely(?) case, try to return *something*
1623 return archetype::find ("bug");
1624}
1625
1626void
1627maptile::play_sound (faceidx sound, int x, int y) const
1628{
1629 if (!sound)
1630 return;
1631
1632 for_all_players_on_map (pl, this)
1633 if (client *ns = pl->ns)
1634 {
1635 int dx = x - pl->ob->x;
1636 int dy = y - pl->ob->y;
1637
1638 int distance = idistance (dx, dy);
1639
1640 if (distance <= MAX_SOUND_DISTANCE)
1641 ns->play_sound (sound, dx, dy);
1642 }
1643}
1644

Diff Legend

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