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.82 by root, Mon Jan 29 16:11:48 2007 UTC vs.
Revision 1.139 by root, Sun May 4 19:14:23 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 <global.h>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 24#include <unistd.h>
30 25
26#include "global.h"
27
28#include "loader.h"
29
31#include "path.h" 30#include "path.h"
32
33/*
34 * This makes a path absolute outside the world of Crossfire.
35 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
36 * and returns the pointer to a static array containing the result.
37 * it really should be called create_mapname
38 */
39const char *
40create_pathname (const char *name)
41{
42 static char buf[8192];
43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44 return buf;
45}
46
47/*
48 * This function checks if a file with the given path exists.
49 * -1 is returned if it fails, otherwise the mode of the file
50 * is returned.
51 * It tries out all the compression suffixes listed in the uncomp[] array.
52 *
53 * If prepend_dir is set, then we call create_pathname (which prepends
54 * libdir & mapdir). Otherwise, we assume the name given is fully
55 * complete.
56 * Only the editor actually cares about the writablity of this -
57 * the rest of the code only cares that the file is readable.
58 * when the editor goes away, the call to stat should probably be
59 * replaced by an access instead (similar to the windows one, but
60 * that seems to be missing the prepend_dir processing
61 */
62int
63check_path (const char *name, int prepend_dir)
64{
65 char buf[MAX_BUF];
66
67 char *endbuf;
68 struct stat statbuf;
69 int mode = 0;
70
71 if (prepend_dir)
72 strcpy (buf, create_pathname (name));
73 else
74 strcpy (buf, name);
75
76 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through
79 * all the names.
80 */
81 endbuf = buf + strlen (buf);
82
83 if (stat (buf, &statbuf))
84 return -1;
85 if (!S_ISREG (statbuf.st_mode))
86 return (-1);
87
88 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
89 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
90 mode |= 4;
91
92 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
93 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
94 mode |= 2;
95
96 return (mode);
97}
98 31
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 32/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 33 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 34 * it will also do map translation for tiled maps, returning
102 * 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
… …
173 * let the player through (inventory checkers for example) 106 * let the player through (inventory checkers for example)
174 */ 107 */
175 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 108 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176 return 0; 109 return 0;
177 110
178 if (ob->head != NULL)
179 ob = ob->head; 111 ob = ob->head_ ();
180 112
181 /* 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
182 * 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
183 * true. If we get through the entire stack, that must mean 115 * true. If we get through the entire stack, that must mean
184 * ob is blocking it, so return 0. 116 * ob is blocking it, so return 0.
… …
214 else 146 else
215 { 147 {
216 /* Broke apart a big nasty if into several here to make 148 /* Broke apart a big nasty if into several here to make
217 * this more readable. first check - if the space blocks 149 * this more readable. first check - if the space blocks
218 * movement, can't move here. 150 * movement, can't move here.
219 * 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
220 * hidden dm 152 * hidden dm
221 */ 153 */
222 if (OB_MOVE_BLOCK (ob, tmp)) 154 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1; 155 return 1;
224 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 156
225 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))
226 return 1; 162 return 1;
227 } 163 }
228 164
229 } 165 }
230 return 0; 166 return 0;
231} 167}
232 168
233/* 169/*
234 * 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
235 * This is meant for multi space objects - for single space objecs, 171 * spot. This is meant for multi space objects - for single space objecs,
236 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
237 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
238 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
239 * 175 *
240 * 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.
241 * 177 *
242 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
243 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
254 * 190 *
255 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
256 * 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
257 * against the move_block values. 193 * against the move_block values.
258 */ 194 */
259int 195bool
260ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
261{ 197{
262 archetype *tmp; 198 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
263 int flag;
264 maptile *m1;
265 sint16 sx, sy;
266
267 if (!ob)
268 {
269 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
270 if (flag & P_OUT_OF_MAP)
271 return P_OUT_OF_MAP;
272
273 /* don't have object, so don't know what types would block */
274 return m1->at (sx, sy).move_block;
275 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
276 201
277 for (tmp = ob->arch; tmp; tmp = tmp->more) 202 if (!pos.normalise ())
278 { 203 return 1;
279 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
280 204
281 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
282 return P_OUT_OF_MAP; 206
283 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
284 return P_IS_ALIVE; 208 return 1;
285 209
286 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
287 211 * (signifying non-moving objects)
288 /* find_first_free_spot() calls this function. However, often
289 * ob doesn't have any move type (when used to place exits)
290 * 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.
291 */ 213 */
292
293 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
294 continue; 215 continue;
295 216
296 /* 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
297 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
298 */ 219 */
299 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
300 return P_NO_PASS; 221 return 1;
301 } 222 }
302 223
303 return 0; 224 return 0;
304} 225}
305 226
… …
323 244
324 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
325 tmp = next; 246 tmp = next;
326 } 247 }
327 248
328 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
329 * carrying. 250 //TODO: remove
330 */ 251 container->update_weight ();
331 sum_weight (container);
332} 252}
333 253
334void 254void
335maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
336{ 256{
… …
343} 263}
344 264
345/* link_multipart_objects go through all the objects on the map looking 265/* link_multipart_objects go through all the objects on the map looking
346 * for objects whose arch says they are multipart yet according to the 266 * for objects whose arch says they are multipart yet according to the
347 * info we have, they only have the head (as would be expected when 267 * info we have, they only have the head (as would be expected when
348 * they are saved). We do have to look for the old maps that did save 268 * they are saved).
349 * the more sections and not re-add sections for them.
350 */ 269 */
351void 270void
352maptile::link_multipart_objects () 271maptile::link_multipart_objects ()
353{ 272{
354 if (!spaces) 273 if (!spaces)
355 return; 274 return;
356 275
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 276 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *tmp = ms->bot; tmp; ) 277 {
278 object *op = ms->bot;
279 while (op)
359 { 280 {
360 object *above = tmp->above;
361
362 /* already multipart - don't do anything more */ 281 /* already multipart - don't do anything more */
363 if (!tmp->head && !tmp->more) 282 if (op->head_ () == op && !op->more && op->arch->more)
364 {
365 /* If there is nothing more to this object, this for loop
366 * won't do anything.
367 */
368 archetype *at;
369 object *last, *op;
370 for (at = tmp->arch->more, last = tmp;
371 at;
372 at = at->more, last = op)
373 { 283 {
374 op = arch_to_object (at); 284 op->remove ();
285 op->expand_tail ();
375 286
376 /* update x,y coordinates */ 287 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
377 op->x += tmp->x; 288 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
378 op->y += tmp->y; 289 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
379 op->head = tmp;
380 op->map = this;
381 last->more = op;
382 op->name = tmp->name;
383 op->title = tmp->title;
384
385 /* we could link all the parts onto tmp, and then just
386 * call insert_ob_in_map once, but the effect is the same,
387 * as insert_ob_in_map will call itself with each part, and
388 * the coding is simpler to just to it here with each part.
389 */
390 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 290 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
291
292 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
293 // so we have to reset the iteration through the mapspace
391 } 294 }
295 else
296 op = op->above;
392 } 297 }
393
394 tmp = above;
395 } 298 }
396} 299}
397 300
398/* 301/*
399 * 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
400 * file pointer. 303 * file pointer.
401 * mapflags is the same as we get with load_original_map
402 */ 304 */
403bool 305bool
404maptile::_load_objects (object_thawer &thawer) 306maptile::_load_objects (object_thawer &f)
405{ 307{
406 int unique; 308 for (;;)
407 object *op, *prev = NULL, *last_more = NULL, *otmp;
408
409 op = object::create ();
410 op->map = this; /* To handle buttons correctly */
411
412 while (int i = load_object (thawer, op, 0))
413 { 309 {
414 /* if the archetype for the object is null, means that we 310 coroapi::cede_to_tick (); // cede once in a while
415 * got an invalid object. Don't do anything with it - the game 311
416 * or editor will not be able to do anything with it either. 312 switch (f.kw)
417 */
418 if (op->arch == NULL)
419 { 313 {
420 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) its 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 if (ms.top)
335 ms.top->above = op;
336 else
337 ms.bot = op;
338
339 ms.top = op;
340 ms.flags_ = 0;
341 }
342 else
343 {
344 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
345 op->destroy ();
346 }
347 }
348
421 continue; 349 continue;
422 }
423 350
424 switch (i)
425 {
426 case LL_NORMAL:
427 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
428
429 if (op->inv)
430 sum_weight (op);
431
432 prev = op, last_more = op;
433 break;
434
435 case LL_MORE: 351 case KW_EOF:
436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 352 return true;
437 op->head = prev, last_more->more = op, last_more = op; 353
354 default:
355 if (!f.parse_error ("map file"))
356 return false;
438 break; 357 break;
439 } 358 }
440 359
441 op = object::create (); 360 f.next ();
442 op->map = this;
443 }
444
445 op->destroy ();
446
447#if 0
448 for (i = 0; i < width; i++)
449 for (j = 0; j < height; j++)
450 {
451 unique = 0;
452 /* check for unique items, or unique squares */
453 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454 {
455 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456 unique = 1;
457
458 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
459 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460 }
461 } 361 }
462#endif
463 362
464 return true; 363 return true;
465} 364}
466 365
467void 366void
468maptile::activate () 367maptile::activate ()
469{ 368{
470 if (!spaces) 369 if (spaces)
471 return;
472
473 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
474 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
475 op->activate_recursive (); 372 op->activate_recursive ();
476} 373}
477 374
478void 375void
479maptile::deactivate () 376maptile::deactivate ()
480{ 377{
481 if (!spaces) 378 if (spaces)
482 return;
483
484 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 379 for (mapspace *ms = spaces + size (); ms-- > spaces; )
485 for (object *op = ms->bot; op; op = op->above) 380 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 381 op->deactivate_recursive ();
487} 382}
488 383
489bool 384bool
490maptile::_save_objects (object_freezer &freezer, int flags) 385maptile::_save_objects (object_freezer &f, int flags)
491{ 386{
492 static int cede_count = 0; 387 coroapi::cede_to_tick ();
493 388
494 if (flags & IO_HEADER) 389 if (flags & IO_HEADER)
495 _save_header (freezer); 390 _save_header (f);
496 391
497 if (!spaces) 392 if (!spaces)
498 return false; 393 return false;
499 394
500 for (int i = 0; i < size (); ++i) 395 for (int i = 0; i < size (); ++i)
501 { 396 {
502#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508#endif
509
510 int unique = 0; 397 bool unique = 0;
398
511 for (object *op = spaces [i].bot; op; op = op->above) 399 for (object *op = spaces [i].bot; op; op = op->above)
512 { 400 {
513 // count per-object, but cede only when modification-safe
514 cede_count++;
515
516 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 401 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
517 unique = 1;
518 402
519 if (!op->can_map_save ()) 403 if (expect_false (!op->can_map_save ()))
520 continue; 404 continue;
521 405
522 if (unique || op->flag [FLAG_UNIQUE]) 406 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
523 { 407 {
524 if (flags & IO_UNIQUES) 408 if (flags & IO_UNIQUES)
525 save_object (freezer, op, 1); 409 op->write (f);
526 } 410 }
527 else if (flags & IO_OBJECTS) 411 else if (expect_true (flags & IO_OBJECTS))
528 save_object (freezer, op, 1); 412 op->write (f);
529 } 413 }
530 } 414 }
531 415
416 coroapi::cede_to_tick ();
417
532 return true; 418 return true;
533}
534
535bool
536maptile::_load_objects (const char *path, bool skip_header)
537{
538 object_thawer thawer (path);
539
540 if (!thawer)
541 return false;
542
543 if (skip_header)
544 for (;;)
545 {
546 keyword kw = thawer.get_kv ();
547
548 if (kw == KW_end)
549 break;
550
551 thawer.skip_kv (kw);
552 }
553
554 return _load_objects (thawer);
555} 419}
556 420
557bool 421bool
558maptile::_save_objects (const char *path, int flags) 422maptile::_save_objects (const char *path, int flags)
559{ 423{
… …
568maptile::maptile () 432maptile::maptile ()
569{ 433{
570 in_memory = MAP_SWAPPED; 434 in_memory = MAP_SWAPPED;
571 435
572 /* The maps used to pick up default x and y values from the 436 /* The maps used to pick up default x and y values from the
573 * map archetype. Mimic that behaviour. 437 * map archetype. Mimic that behaviour.
574 */ 438 */
575 width = 16; 439 width = 16;
576 height = 16; 440 height = 16;
577 reset_timeout = 0;
578 timeout = 300; 441 timeout = 300;
579 enter_x = 0; 442 max_nrof = 1000; // 1000 items of anything
580 enter_y = 0; 443 max_volume = 2000000; // 2m³
581} 444}
582 445
583maptile::maptile (int w, int h) 446maptile::maptile (int w, int h)
584{ 447{
585 in_memory = MAP_SWAPPED; 448 in_memory = MAP_SWAPPED;
… …
735bool 598bool
736maptile::_load_header (object_thawer &thawer) 599maptile::_load_header (object_thawer &thawer)
737{ 600{
738 for (;;) 601 for (;;)
739 { 602 {
740 keyword kw = thawer.get_kv ();
741
742 switch (kw) 603 switch (thawer.kw)
743 { 604 {
744 case KW_EOF:
745 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
746 return false;
747
748 case KW_end:
749 return true;
750
751 default:
752 case KW_ERROR:
753 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
754 break;
755
756 case KW_msg: 605 case KW_msg:
757 thawer.get_ml (KW_endmsg, msg); 606 thawer.get_ml (KW_endmsg, msg);
758 break; 607 break;
759 608
760 case KW_lore: // CF+ extension 609 case KW_lore: // CF+ extension
… …
791 case KW_winddir: thawer.get (winddir); break; 640 case KW_winddir: thawer.get (winddir); break;
792 case KW_sky: thawer.get (sky); break; 641 case KW_sky: thawer.get (sky); break;
793 642
794 case KW_per_player: thawer.get (per_player); break; 643 case KW_per_player: thawer.get (per_player); break;
795 case KW_per_party: thawer.get (per_party); break; 644 case KW_per_party: thawer.get (per_party); break;
645 case KW_no_reset: thawer.get (no_reset); break;
796 646
797 case KW_region: default_region = region::find (thawer.get_str ()); break; 647 case KW_region: default_region = region::find (thawer.get_str ()); break;
798 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 648 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
799 649
800 // old names new names 650 // old names new names
… …
810 660
811 case KW_tile_path_1: thawer.get (tile_path [0]); break; 661 case KW_tile_path_1: thawer.get (tile_path [0]); break;
812 case KW_tile_path_2: thawer.get (tile_path [1]); break; 662 case KW_tile_path_2: thawer.get (tile_path [1]); break;
813 case KW_tile_path_3: thawer.get (tile_path [2]); break; 663 case KW_tile_path_3: thawer.get (tile_path [2]); break;
814 case KW_tile_path_4: thawer.get (tile_path [3]); break; 664 case KW_tile_path_4: thawer.get (tile_path [3]); break;
665
666 case KW_ERROR:
667 set_key_text (thawer.kw_str, thawer.value);
668 break;
669
670 case KW_end:
671 thawer.next ();
672 return true;
673
674 default:
675 if (!thawer.parse_error ("map", 0))
676 return false;
677 break;
815 } 678 }
679
680 thawer.next ();
816 } 681 }
817 682
818 abort (); 683 abort ();
819}
820
821bool
822maptile::_load_header (const char *path)
823{
824 object_thawer thawer (path);
825
826 if (!thawer)
827 return false;
828
829 return _load_header (thawer);
830} 684}
831 685
832/****************************************************************************** 686/******************************************************************************
833 * This is the start of unique map handling code 687 * This is the start of unique map handling code
834 *****************************************************************************/ 688 *****************************************************************************/
… …
845 object *above = op->above; 699 object *above = op->above;
846 700
847 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 701 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
848 unique = 1; 702 unique = 1;
849 703
850 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 704 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
851 { 705 {
852 op->destroy_inv (false); 706 op->destroy_inv (false);
853 op->destroy (); 707 op->destroy ();
854 } 708 }
855 709
… …
869 if (name) MAP_OUT (name); 723 if (name) MAP_OUT (name);
870 MAP_OUT (swap_time); 724 MAP_OUT (swap_time);
871 MAP_OUT (reset_time); 725 MAP_OUT (reset_time);
872 MAP_OUT (reset_timeout); 726 MAP_OUT (reset_timeout);
873 MAP_OUT (fixed_resettime); 727 MAP_OUT (fixed_resettime);
728 MAP_OUT (no_reset);
874 MAP_OUT (difficulty); 729 MAP_OUT (difficulty);
875 730
876 if (default_region) MAP_OUT2 (region, default_region->name); 731 if (default_region) MAP_OUT2 (region, default_region->name);
877 732
878 if (shopitems) 733 if (shopitems)
… …
932 * Remove and free all objects in the given map. 787 * Remove and free all objects in the given map.
933 */ 788 */
934void 789void
935maptile::clear () 790maptile::clear ()
936{ 791{
937 sfree (regions, size ()), regions = 0;
938 free (regionmap), regionmap = 0;
939
940 if (spaces) 792 if (spaces)
941 { 793 {
942 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 794 for (mapspace *ms = spaces + size (); ms-- > spaces; )
943 while (object *op = ms->bot) 795 while (object *op = ms->bot)
944 { 796 {
797 // manually remove, as to not trigger anything
798 if (ms->bot = op->above)
799 ms->bot->below = 0;
800
801 op->flag [FLAG_REMOVED] = true;
802
803 object *head = op->head_ ();
945 if (op->head) 804 if (op == head)
946 op = op->head; 805 {
947
948 op->destroy_inv (false); 806 op->destroy_inv (false);
949 op->destroy (); 807 op->destroy ();
808 }
809 else if (head->map != op->map)
810 {
811 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
812 head->destroy ();
813 }
950 } 814 }
951 815
952 sfree (spaces, size ()), spaces = 0; 816 sfree0 (spaces, size ());
953 } 817 }
954 818
955 if (buttons) 819 if (buttons)
956 free_objectlinkpt (buttons), buttons = 0; 820 free_objectlinkpt (buttons), buttons = 0;
821
822 sfree0 (regions, size ());
823 delete [] regionmap; regionmap = 0;
957} 824}
958 825
959void 826void
960maptile::clear_header () 827maptile::clear_header ()
961{ 828{
… …
991maptile::do_destroy () 858maptile::do_destroy ()
992{ 859{
993 attachable::do_destroy (); 860 attachable::do_destroy ();
994 861
995 clear (); 862 clear ();
863}
864
865/* decay and destroy perishable items in a map */
866void
867maptile::do_decay_objects ()
868{
869 if (!spaces)
870 return;
871
872 for (mapspace *ms = spaces + size (); ms-- > spaces; )
873 for (object *above, *op = ms->bot; op; op = above)
874 {
875 above = op->above;
876
877 bool destroy = 0;
878
879 // do not decay anything above unique floor tiles (yet :)
880 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
881 break;
882
883 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
884 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
885 || QUERY_FLAG (op, FLAG_UNIQUE)
886 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
887 || QUERY_FLAG (op, FLAG_UNPAID)
888 || op->is_alive ())
889 ; // do not decay
890 else if (op->is_weapon ())
891 {
892 op->stats.dam--;
893 if (op->stats.dam < 0)
894 destroy = 1;
895 }
896 else if (op->is_armor ())
897 {
898 op->stats.ac--;
899 if (op->stats.ac < 0)
900 destroy = 1;
901 }
902 else if (op->type == FOOD)
903 {
904 op->stats.food -= rndm (5, 20);
905 if (op->stats.food < 0)
906 destroy = 1;
907 }
908 else
909 {
910 int mat = op->materials;
911
912 if (mat & M_PAPER
913 || mat & M_LEATHER
914 || mat & M_WOOD
915 || mat & M_ORGANIC
916 || mat & M_CLOTH
917 || mat & M_LIQUID
918 || (mat & M_IRON && rndm (1, 5) == 1)
919 || (mat & M_GLASS && rndm (1, 2) == 1)
920 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
921 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
922 || (mat & M_ICE && temp > 32))
923 destroy = 1;
924 }
925
926 /* adjust overall chance below */
927 if (destroy && rndm (0, 1))
928 op->destroy ();
929 }
996} 930}
997 931
998/* 932/*
999 * Updates every button on the map (by calling update_button() for them). 933 * Updates every button on the map (by calling update_button() for them).
1000 */ 934 */
… …
1048 if (QUERY_FLAG (op, FLAG_GENERATOR)) 982 if (QUERY_FLAG (op, FLAG_GENERATOR))
1049 { 983 {
1050 total_exp += op->stats.exp; 984 total_exp += op->stats.exp;
1051 985
1052 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 986 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1053 total_exp += at->clone.stats.exp * 8; 987 total_exp += at->stats.exp * 8;
1054 988
1055 monster_cnt++; 989 monster_cnt++;
1056 } 990 }
1057 } 991 }
1058 992
… …
1113void 1047void
1114mapspace::update_ () 1048mapspace::update_ ()
1115{ 1049{
1116 object *tmp, *last = 0; 1050 object *tmp, *last = 0;
1117 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1051 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1118 facetile *top, *floor, *middle;
1119 object *top_obj, *floor_obj, *middle_obj;
1120 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1052 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1121 1053
1122 middle = blank_face; 1054 //object *middle = 0;
1123 top = blank_face; 1055 //object *top = 0;
1124 floor = blank_face; 1056 //object *floor = 0;
1125 1057 // this seems to generate better code than using locals, above
1126 middle_obj = 0; 1058 object *&top = faces_obj[0] = 0;
1127 top_obj = 0; 1059 object *&middle = faces_obj[1] = 0;
1128 floor_obj = 0; 1060 object *&floor = faces_obj[2] = 0;
1129 1061
1130 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1062 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1131 { 1063 {
1132 /* This could be made additive I guess (two lights better than 1064 /* This could be made additive I guess (two lights better than
1133 * one). But if so, it shouldn't be a simple additive - 2 1065 * one). But if so, it shouldn't be a simple additive - 2
1134 * light bulbs do not illuminate twice as far as once since 1066 * light bulbs do not illuminate twice as far as once since
1135 * it is a dissapation factor that is cubed. 1067 * it is a dissapation factor that is cubed.
1136 */ 1068 */
1137 if (tmp->glow_radius > light)
1138 light = tmp->glow_radius; 1069 light = max (light, tmp->glow_radius);
1139 1070
1140 /* This call is needed in order to update objects the player 1071 /* This call is needed in order to update objects the player
1141 * is standing in that have animations (ie, grass, fire, etc). 1072 * is standing in that have animations (ie, grass, fire, etc).
1142 * However, it also causes the look window to be re-drawn 1073 * However, it also causes the look window to be re-drawn
1143 * 3 times each time the player moves, because many of the 1074 * 3 times each time the player moves, because many of the
… …
1146 * Always put the player down for drawing. 1077 * Always put the player down for drawing.
1147 */ 1078 */
1148 if (!tmp->invisible) 1079 if (!tmp->invisible)
1149 { 1080 {
1150 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1081 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1151 {
1152 top = tmp->face;
1153 top_obj = tmp; 1082 top = tmp;
1154 }
1155 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1083 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1156 { 1084 {
1157 /* If we got a floor, that means middle and top were below it, 1085 /* If we got a floor, that means middle and top were below it,
1158 * so should not be visible, so we clear them. 1086 * so should not be visible, so we clear them.
1159 */ 1087 */
1160 middle = blank_face; 1088 middle = 0;
1161 top = blank_face; 1089 top = 0;
1162 floor = tmp->face;
1163 floor_obj = tmp; 1090 floor = tmp;
1164 } 1091 }
1165 /* Flag anywhere have high priority */ 1092 /* Flag anywhere have high priority */
1166 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1093 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1167 { 1094 {
1168 middle = tmp->face;
1169
1170 middle_obj = tmp; 1095 middle = tmp;
1171 anywhere = 1; 1096 anywhere = 1;
1172 } 1097 }
1173 /* Find the highest visible face around. If equal 1098 /* Find the highest visible face around. If equal
1174 * visibilities, we still want the one nearer to the 1099 * visibilities, we still want the one nearer to the
1175 * top 1100 * top
1176 */ 1101 */
1177 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1102 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1178 {
1179 middle = tmp->face;
1180 middle_obj = tmp; 1103 middle = tmp;
1181 }
1182 } 1104 }
1183 1105
1184 if (tmp == tmp->above) 1106 if (tmp == tmp->above)
1185 { 1107 {
1186 LOG (llevError, "Error in structure of map\n"); 1108 LOG (llevError, "Error in structure of map\n");
… …
1221 * middle face. This should not happen, as we already have the 1143 * middle face. This should not happen, as we already have the
1222 * else statement above so middle should not get set. OTOH, it 1144 * else statement above so middle should not get set. OTOH, it
1223 * may be possible for the faces to match but be different objects. 1145 * may be possible for the faces to match but be different objects.
1224 */ 1146 */
1225 if (top == middle) 1147 if (top == middle)
1226 middle = blank_face; 1148 middle = 0;
1227 1149
1228 /* There are three posibilities at this point: 1150 /* There are three posibilities at this point:
1229 * 1) top face is set, need middle to be set. 1151 * 1) top face is set, need middle to be set.
1230 * 2) middle is set, need to set top. 1152 * 2) middle is set, need to set top.
1231 * 3) neither middle or top is set - need to set both. 1153 * 3) neither middle or top is set - need to set both.
… …
1236 /* Once we get to a floor, stop, since we already have a floor object */ 1158 /* Once we get to a floor, stop, since we already have a floor object */
1237 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1159 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1238 break; 1160 break;
1239 1161
1240 /* If two top faces are already set, quit processing */ 1162 /* If two top faces are already set, quit processing */
1241 if ((top != blank_face) && (middle != blank_face)) 1163 if (top && middle)
1242 break; 1164 break;
1243 1165
1244 /* Only show visible faces */ 1166 /* Only show visible faces */
1245 if (!tmp->invisible) 1167 if (!tmp->invisible)
1246 { 1168 {
1247 /* Fill in top if needed */ 1169 /* Fill in top if needed */
1248 if (top == blank_face) 1170 if (!top)
1249 { 1171 {
1250 top = tmp->face;
1251 top_obj = tmp; 1172 top = tmp;
1252 if (top == middle) 1173 if (top == middle)
1253 middle = blank_face; 1174 middle = 0;
1254 } 1175 }
1255 else 1176 else
1256 { 1177 {
1257 /* top is already set - we should only get here if 1178 /* top is already set - we should only get here if
1258 * middle is not set 1179 * middle is not set
1259 * 1180 *
1260 * Set the middle face and break out, since there is nothing 1181 * Set the middle face and break out, since there is nothing
1261 * more to fill in. We don't check visiblity here, since 1182 * more to fill in. We don't check visiblity here, since
1262 * 1183 *
1263 */ 1184 */
1264 if (tmp->face != top) 1185 if (tmp != top)
1265 { 1186 {
1266 middle = tmp->face;
1267 middle_obj = tmp; 1187 middle = tmp;
1268 break; 1188 break;
1269 } 1189 }
1270 } 1190 }
1271 } 1191 }
1272 } 1192 }
1273 1193
1274 if (middle == floor) 1194 if (middle == floor)
1275 middle = blank_face; 1195 middle = 0;
1276 1196
1277 if (top == middle) 1197 if (top == middle)
1278 middle = blank_face; 1198 middle = 0;
1279 1199
1280 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1200#if 0
1281 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1201 faces_obj [0] = top;
1282 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1202 faces_obj [1] = middle;
1203 faces_obj [2] = floor;
1204#endif
1283} 1205}
1284 1206
1285/* this updates the orig_map->tile_map[tile_num] value after finding 1207uint64
1286 * the map. It also takes care of linking back the freshly found 1208mapspace::volume () const
1287 * maps tile_map values if it tiles back to this one. It returns
1288 * the value of orig_map->tile_map[tile_num].
1289 */
1290static inline maptile *
1291find_and_link (maptile *orig_map, int tile_num)
1292{ 1209{
1293 maptile *mp = orig_map->tile_map [tile_num]; 1210 uint64 vol = 0;
1294 1211
1295 if (!mp) 1212 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1296 { 1213 vol += op->volume ();
1297 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1298 1214
1299 if (!mp) 1215 return vol;
1300 { 1216}
1301 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1302 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1303 &orig_map->tile_path[tile_num], &orig_map->path);
1304 mp = new maptile (1, 1);
1305 mp->alloc ();
1306 mp->in_memory = MAP_IN_MEMORY;
1307 }
1308 }
1309 1217
1310 int dest_tile = (tile_num + 2) % 4; 1218bool
1219maptile::tile_available (int dir, bool load)
1220{
1221 if (!tile_path[dir])
1222 return 0;
1311 1223
1312 orig_map->tile_map [tile_num] = mp; 1224 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1225 return 1;
1313 1226
1314 // optimisation: back-link map to origin map if euclidean 1227 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1315 //TODO: non-euclidean maps MUST GO 1228 return 1;
1316 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1317 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1318 1229
1319 return mp; 1230 return 0;
1320}
1321
1322static inline void
1323load_and_link (maptile *orig_map, int tile_num)
1324{
1325 find_and_link (orig_map, tile_num)->load_sync ();
1326} 1231}
1327 1232
1328/* this returns TRUE if the coordinates (x,y) are out of 1233/* this returns TRUE if the coordinates (x,y) are out of
1329 * map m. This function also takes into account any 1234 * map m. This function also takes into account any
1330 * tiling considerations, loading adjacant maps as needed. 1235 * tiling considerations, loading adjacant maps as needed.
… …
1343 if (!m) 1248 if (!m)
1344 return 0; 1249 return 0;
1345 1250
1346 if (x < 0) 1251 if (x < 0)
1347 { 1252 {
1348 if (!m->tile_path[3]) 1253 if (!m->tile_available (3))
1349 return 1; 1254 return 1;
1350 1255
1351 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1352 find_and_link (m, 3);
1353
1354 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1256 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1355 } 1257 }
1356 1258
1357 if (x >= m->width) 1259 if (x >= m->width)
1358 { 1260 {
1359 if (!m->tile_path[1]) 1261 if (!m->tile_available (1))
1360 return 1; 1262 return 1;
1361 1263
1362 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1363 find_and_link (m, 1);
1364
1365 return out_of_map (m->tile_map[1], x - m->width, y); 1264 return out_of_map (m->tile_map[1], x - m->width, y);
1366 } 1265 }
1367 1266
1368 if (y < 0) 1267 if (y < 0)
1369 { 1268 {
1370 if (!m->tile_path[0]) 1269 if (!m->tile_available (0))
1371 return 1; 1270 return 1;
1372 1271
1373 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1374 find_and_link (m, 0);
1375
1376 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1272 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1377 } 1273 }
1378 1274
1379 if (y >= m->height) 1275 if (y >= m->height)
1380 { 1276 {
1381 if (!m->tile_path[2]) 1277 if (!m->tile_available (2))
1382 return 1; 1278 return 1;
1383
1384 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1385 find_and_link (m, 2);
1386 1279
1387 return out_of_map (m->tile_map[2], x, y - m->height); 1280 return out_of_map (m->tile_map[2], x, y - m->height);
1388 } 1281 }
1389 1282
1390 /* Simple case - coordinates are within this local 1283 /* Simple case - coordinates are within this local
… …
1404maptile * 1297maptile *
1405maptile::xy_find (sint16 &x, sint16 &y) 1298maptile::xy_find (sint16 &x, sint16 &y)
1406{ 1299{
1407 if (x < 0) 1300 if (x < 0)
1408 { 1301 {
1409 if (!tile_path[3]) 1302 if (!tile_available (3))
1410 return 0; 1303 return 0;
1411 1304
1412 find_and_link (this, 3);
1413 x += tile_map[3]->width; 1305 x += tile_map[3]->width;
1414 return tile_map[3]->xy_find (x, y); 1306 return tile_map[3]->xy_find (x, y);
1415 } 1307 }
1416 1308
1417 if (x >= width) 1309 if (x >= width)
1418 { 1310 {
1419 if (!tile_path[1]) 1311 if (!tile_available (1))
1420 return 0; 1312 return 0;
1421 1313
1422 find_and_link (this, 1);
1423 x -= width; 1314 x -= width;
1424 return tile_map[1]->xy_find (x, y); 1315 return tile_map[1]->xy_find (x, y);
1425 } 1316 }
1426 1317
1427 if (y < 0) 1318 if (y < 0)
1428 { 1319 {
1429 if (!tile_path[0]) 1320 if (!tile_available (0))
1430 return 0; 1321 return 0;
1431 1322
1432 find_and_link (this, 0);
1433 y += tile_map[0]->height; 1323 y += tile_map[0]->height;
1434 return tile_map[0]->xy_find (x, y); 1324 return tile_map[0]->xy_find (x, y);
1435 } 1325 }
1436 1326
1437 if (y >= height) 1327 if (y >= height)
1438 { 1328 {
1439 if (!tile_path[2]) 1329 if (!tile_available (2))
1440 return 0; 1330 return 0;
1441 1331
1442 find_and_link (this, 2);
1443 y -= height; 1332 y -= height;
1444 return tile_map[2]->xy_find (x, y); 1333 return tile_map[2]->xy_find (x, y);
1445 } 1334 }
1446 1335
1447 /* Simple case - coordinates are within this local 1336 /* Simple case - coordinates are within this local
… …
1458adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1347adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1459{ 1348{
1460 if (!map1 || !map2) 1349 if (!map1 || !map2)
1461 return 0; 1350 return 0;
1462 1351
1463 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1352 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1464 //fix: compare paths instead (this is likely faster, too!) 1353 //fix: compare paths instead (this is likely faster, too!)
1465 if (map1 == map2) 1354 if (map1 == map2)
1466 { 1355 {
1467 *dx = 0; 1356 *dx = 0;
1468 *dy = 0; 1357 *dy = 0;
… …
1574get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1463get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1575{ 1464{
1576 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1465 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1577 { 1466 {
1578 /* be conservative and fill in _some_ data */ 1467 /* be conservative and fill in _some_ data */
1579 retval->distance = 100000; 1468 retval->distance = 10000;
1580 retval->distance_x = 32767; 1469 retval->distance_x = 10000;
1581 retval->distance_y = 32767; 1470 retval->distance_y = 10000;
1582 retval->direction = 0; 1471 retval->direction = 0;
1583 retval->part = 0; 1472 retval->part = 0;
1584 } 1473 }
1585 else 1474 else
1586 { 1475 {
… …
1591 1480
1592 best = op1; 1481 best = op1;
1593 /* If this is multipart, find the closest part now */ 1482 /* If this is multipart, find the closest part now */
1594 if (!(flags & 0x1) && op1->more) 1483 if (!(flags & 0x1) && op1->more)
1595 { 1484 {
1596 object *tmp;
1597 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1485 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1598 1486
1599 /* we just take the offset of the piece to head to figure 1487 /* we just take the offset of the piece to head to figure
1600 * distance instead of doing all that work above again 1488 * distance instead of doing all that work above again
1601 * since the distance fields we set above are positive in the 1489 * since the distance fields we set above are positive in the
1602 * same axis as is used for multipart objects, the simply arithmetic 1490 * same axis as is used for multipart objects, the simply arithmetic
1603 * below works. 1491 * below works.
1604 */ 1492 */
1605 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1493 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1606 { 1494 {
1607 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1495 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1608 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1496 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1609 if (tmpi < best_distance) 1497 if (tmpi < best_distance)
1610 { 1498 {
… …
1619 retval->distance_y += op1->y - best->y; 1507 retval->distance_y += op1->y - best->y;
1620 } 1508 }
1621 } 1509 }
1622 1510
1623 retval->part = best; 1511 retval->part = best;
1624 retval->distance = idistance (retval->distance_x, retval->distance_y); 1512 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1625 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1513 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1626 } 1514 }
1627} 1515}
1628 1516
1629/* this is basically the same as get_rangevector above, but instead of 1517/* this is basically the same as get_rangevector above, but instead of
… …
1697 return default_region; 1585 return default_region;
1698 1586
1699 return ::region::default_region (); 1587 return ::region::default_region ();
1700} 1588}
1701 1589
1590/* picks a random object from a style map.
1591 */
1592object *
1593maptile::pick_random_object (rand_gen &gen) const
1594{
1595 /* while returning a null object will result in a crash, that
1596 * is actually preferable to an infinite loop. That is because
1597 * most servers will automatically restart in case of crash.
1598 * Change the logic on getting the random space - shouldn't make
1599 * any difference, but this seems clearer to me.
1600 */
1601 for (int i = 1000; --i;)
1602 {
1603 object *pick = at (gen (width), gen (height)).bot;
1604
1605 // do not prefer big monsters just because they are big.
1606 if (pick && pick->is_head ())
1607 return pick->head_ ();
1608 }
1609
1610 // instead of crashing in the unlikely(?) case, try to return *something*
1611 return archetype::find ("bug");
1612}
1613
1614void
1615maptile::play_sound (faceidx sound, int x, int y) const
1616{
1617 if (!sound)
1618 return;
1619
1620 for_all_players (pl)
1621 if (pl->ob->map == this)
1622 if (client *ns = pl->ns)
1623 {
1624 int dx = x - pl->ob->x;
1625 int dy = y - pl->ob->y;
1626
1627 int distance = idistance (dx, dy);
1628
1629 if (distance <= MAX_SOUND_DISTANCE)
1630 ns->play_sound (sound, dx, dy);
1631 }
1632}
1633

Diff Legend

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