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.93 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.131 by root, Thu Oct 4 11:48:06 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de>
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" 27#include "funcpoint.h"
29 28
30#include "loader.h" 29#include "loader.h"
31 30
32#include "path.h" 31#include "path.h"
33
34/*
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 32
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 36 * new values into newmap, nx, and ny. Any and all of those
… …
174 * let the player through (inventory checkers for example) 107 * let the player through (inventory checkers for example)
175 */ 108 */
176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 109 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177 return 0; 110 return 0;
178 111
179 if (ob->head != NULL)
180 ob = ob->head; 112 ob = ob->head_ ();
181 113
182 /* We basically go through the stack of objects, and if there is 114 /* 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 115 * some other object that has NO_PASS or FLAG_ALIVE set, return
184 * true. If we get through the entire stack, that must mean 116 * true. If we get through the entire stack, that must mean
185 * ob is blocking it, so return 0. 117 * ob is blocking it, so return 0.
… …
215 else 147 else
216 { 148 {
217 /* Broke apart a big nasty if into several here to make 149 /* Broke apart a big nasty if into several here to make
218 * this more readable. first check - if the space blocks 150 * this more readable. first check - if the space blocks
219 * movement, can't move here. 151 * movement, can't move here.
220 * second - if a monster, can't move there, unles it is a 152 * second - if a monster, can't move there, unless it is a
221 * hidden dm 153 * hidden dm
222 */ 154 */
223 if (OB_MOVE_BLOCK (ob, tmp)) 155 if (OB_MOVE_BLOCK (ob, tmp))
224 return 1; 156 return 1;
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 157
226 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 158 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob
160 && tmp != ob
161 && tmp->type != DOOR
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
227 return 1; 163 return 1;
228 } 164 }
229 165
230 } 166 }
231 return 0; 167 return 0;
232} 168}
233 169
234/* 170/*
235 * Returns true if the given object can't fit in the given spot. 171 * 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, 172 * spot. This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 173 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 174 * of object. This function goes through all the parts of the multipart
239 * multipart object and makes sure they can be inserted. 175 * object and makes sure they can be inserted.
240 * 176 *
241 * While this doesn't call out of map, the get_map_flags does. 177 * While this doesn't call out of map, the get_map_flags does.
242 * 178 *
243 * This function has been used to deprecate arch_out_of_map - 179 * This function has been used to deprecate arch_out_of_map -
244 * this function also does that check, and since in most cases, 180 * this function also does that check, and since in most cases,
… …
255 * 191 *
256 * Note this used to be arch_blocked, but with new movement 192 * Note this used to be arch_blocked, but with new movement
257 * code, we need to have actual object to check its move_type 193 * code, we need to have actual object to check its move_type
258 * against the move_block values. 194 * against the move_block values.
259 */ 195 */
260int 196bool
261ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 197object::blocked (maptile *m, int x, int y) const
262{ 198{
263 archetype *tmp; 199 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 } 200 {
201 mapxy pos (m, x + tmp->x, y + tmp->y);
277 202
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 203 if (!pos.normalise ())
279 { 204 return 1;
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281 205
282 if (flag & P_OUT_OF_MAP) 206 mapspace &ms = *pos;
283 return P_OUT_OF_MAP; 207
284 if (flag & P_IS_ALIVE) 208 if (ms.flags () & P_IS_ALIVE)
285 return P_IS_ALIVE; 209 return 1;
286 210
287 mapspace &ms = m1->at (sx, sy); 211 /* However, often ob doesn't have any move type
288 212 * (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. 213 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
292 */ 214 */
293
294 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 215 if (!move_type && ms.move_block != MOVE_ALL)
295 continue; 216 continue;
296 217
297 /* Note it is intentional that we check ob - the movement type of the 218 /* Note it is intentional that we check ob - the movement type of the
298 * head of the object should correspond for the entire object. 219 * head of the object should correspond for the entire object.
299 */ 220 */
300 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 221 if (ms.blocks (move_type))
301 return P_NO_PASS; 222 return 1;
302 } 223 }
303 224
304 return 0; 225 return 0;
305} 226}
306 227
… …
344} 265}
345 266
346/* link_multipart_objects go through all the objects on the map looking 267/* 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 268 * 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 269 * 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 270 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 271 */
352void 272void
353maptile::link_multipart_objects () 273maptile::link_multipart_objects ()
354{ 274{
355 if (!spaces) 275 if (!spaces)
356 return; 276 return;
357 277
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 278 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 279 {
280 object *op = ms->bot;
281 while (op)
360 { 282 {
361 /* already multipart - don't do anything more */ 283 /* already multipart - don't do anything more */
362 if (!tmp->head && !tmp->more) 284 if (op->head_ () == op && !op->more && op->arch->more)
363 {
364 /* If there is nothing more to this object, this for loop
365 * won't do anything.
366 */
367 archetype *at;
368 object *last, *op;
369 for (at = tmp->arch->more, last = tmp;
370 at;
371 at = at->more, last = op)
372 { 285 {
373 op = arch_to_object (at); 286 op->remove ();
287 op->expand_tail ();
374 288
375 /* update x,y coordinates */ 289 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
376 op->x += tmp->x; 290 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
377 op->y += tmp->y; 291 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
378 op->head = tmp;
379 op->map = this;
380 last->more = op;
381 op->name = tmp->name;
382 op->title = tmp->title;
383
384 /* we could link all the parts onto tmp, and then just
385 * call insert_ob_in_map once, but the effect is the same,
386 * as insert_ob_in_map will call itself with each part, and
387 * the coding is simpler to just to it here with each part.
388 */
389 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 292 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
293
294 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
295 // so we have to reset the iteration through the mapspace
390 } 296 }
297 else
298 op = op->above;
391 } 299 }
392 } 300 }
393} 301}
394 302
395/* 303/*
396 * Loads (ands parses) the objects into a given map from the specified 304 * Loads (ands parses) the objects into a given map from the specified
397 * file pointer. 305 * file pointer.
… …
399bool 307bool
400maptile::_load_objects (object_thawer &f) 308maptile::_load_objects (object_thawer &f)
401{ 309{
402 for (;;) 310 for (;;)
403 { 311 {
404 coroapi::cede_every (1000); // cede once in a while 312 coroapi::cede_to_tick_every (100); // cede once in a while
405 313
406 switch (f.kw) 314 switch (f.kw)
407 { 315 {
408 case KW_arch: 316 case KW_arch:
409 if (object *op = object::read (f, this)) 317 if (object *op = object::read (f, this))
410 { 318 {
411 if (op->inv) 319 if (op->inv)
412 sum_weight (op); 320 sum_weight (op);
413 321
414 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
323 {
324 // we insert manually because
325 // a) its way faster
326 // b) we remove manually, too, and there are good reasons for that
327 // c) its correct
328 mapspace &ms = at (op->x, op->y);
329
330 op->flag [FLAG_REMOVED] = false;
331
332 op->above = 0;
333 op->below = ms.top;
334
335 if (ms.top)
336 ms.top->above = op;
337 else
338 ms.bot = op;
339
340 ms.top = op;
341 ms.flags_ = 0;
342 }
343 else
344 {
345 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
346 op->destroy ();
347 }
415 } 348 }
416 349
417 continue; 350 continue;
418 351
419 case KW_EOF: 352 case KW_EOF:
… …
432} 365}
433 366
434void 367void
435maptile::activate () 368maptile::activate ()
436{ 369{
437 if (!spaces) 370 if (spaces)
438 return;
439
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 371 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 372 for (object *op = ms->bot; op; op = op->above)
442 op->activate_recursive (); 373 op->activate_recursive ();
443} 374}
444 375
445void 376void
446maptile::deactivate () 377maptile::deactivate ()
447{ 378{
448 if (!spaces) 379 if (spaces)
449 return;
450
451 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 380 for (mapspace *ms = spaces + size (); ms-- > spaces; )
452 for (object *op = ms->bot; op; op = op->above) 381 for (object *op = ms->bot; op; op = op->above)
453 op->deactivate_recursive (); 382 op->deactivate_recursive ();
454} 383}
455 384
456bool 385bool
457maptile::_save_objects (object_freezer &f, int flags) 386maptile::_save_objects (object_freezer &f, int flags)
458{ 387{
459 static int cede_count = 0; 388 coroapi::cede_to_tick ();
460 389
461 if (flags & IO_HEADER) 390 if (flags & IO_HEADER)
462 _save_header (f); 391 _save_header (f);
463 392
464 if (!spaces) 393 if (!spaces)
465 return false; 394 return false;
466 395
467 for (int i = 0; i < size (); ++i) 396 for (int i = 0; i < size (); ++i)
468 { 397 {
469#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
470 if (cede_count >= 500)
471 {
472 cede_count = 0;
473 coroapi::cede ();
474 }
475#endif
476
477 int unique = 0; 398 bool unique = 0;
399
478 for (object *op = spaces [i].bot; op; op = op->above) 400 for (object *op = spaces [i].bot; op; op = op->above)
479 { 401 {
480 // count per-object, but cede only when modification-safe
481 cede_count++;
482
483 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 402 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
484 unique = 1;
485 403
486 if (!op->can_map_save ()) 404 if (expect_false (!op->can_map_save ()))
487 continue; 405 continue;
488 406
489 if (unique || op->flag [FLAG_UNIQUE]) 407 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
490 { 408 {
491 if (flags & IO_UNIQUES) 409 if (flags & IO_UNIQUES)
492 op->write (f); 410 op->write (f);
493 } 411 }
494 else if (flags & IO_OBJECTS) 412 else if (expect_true (flags & IO_OBJECTS))
495 op->write (f); 413 op->write (f);
496 } 414 }
497 } 415 }
498 416
417 coroapi::cede_to_tick ();
418
499 return true; 419 return true;
500}
501
502bool
503maptile::_load_objects (const char *path, bool skip_header)
504{
505 object_thawer f (path);
506
507 if (!f)
508 return false;
509
510 f.next ();
511
512 if (skip_header)
513 for (;;)
514 {
515 keyword kw = f.kw;
516 f.skip ();
517 if (kw == KW_end)
518 break;
519 }
520
521 return _load_objects (f);
522} 420}
523 421
524bool 422bool
525maptile::_save_objects (const char *path, int flags) 423maptile::_save_objects (const char *path, int flags)
526{ 424{
… …
701bool 599bool
702maptile::_load_header (object_thawer &thawer) 600maptile::_load_header (object_thawer &thawer)
703{ 601{
704 for (;;) 602 for (;;)
705 { 603 {
706 keyword kw = thawer.get_kv ();
707
708 switch (kw) 604 switch (thawer.kw)
709 { 605 {
710 case KW_msg: 606 case KW_msg:
711 thawer.get_ml (KW_endmsg, msg); 607 thawer.get_ml (KW_endmsg, msg);
712 break; 608 break;
713 609
… …
745 case KW_winddir: thawer.get (winddir); break; 641 case KW_winddir: thawer.get (winddir); break;
746 case KW_sky: thawer.get (sky); break; 642 case KW_sky: thawer.get (sky); break;
747 643
748 case KW_per_player: thawer.get (per_player); break; 644 case KW_per_player: thawer.get (per_player); break;
749 case KW_per_party: thawer.get (per_party); break; 645 case KW_per_party: thawer.get (per_party); break;
646 case KW_no_reset: thawer.get (no_reset); break;
750 647
751 case KW_region: default_region = region::find (thawer.get_str ()); break; 648 case KW_region: default_region = region::find (thawer.get_str ()); break;
752 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 649 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
753 650
754 // old names new names 651 // old names new names
… …
765 case KW_tile_path_1: thawer.get (tile_path [0]); break; 662 case KW_tile_path_1: thawer.get (tile_path [0]); break;
766 case KW_tile_path_2: thawer.get (tile_path [1]); break; 663 case KW_tile_path_2: thawer.get (tile_path [1]); break;
767 case KW_tile_path_3: thawer.get (tile_path [2]); break; 664 case KW_tile_path_3: thawer.get (tile_path [2]); break;
768 case KW_tile_path_4: thawer.get (tile_path [3]); break; 665 case KW_tile_path_4: thawer.get (tile_path [3]); break;
769 666
667 case KW_ERROR:
668 set_key_text (thawer.kw_str, thawer.value);
669 break;
670
770 case KW_end: 671 case KW_end:
672 thawer.next ();
771 return true; 673 return true;
772 674
773 default: 675 default:
774 if (!thawer.parse_error ("map", 0)) 676 if (!thawer.parse_error ("map", 0))
775 return false; 677 return false;
776 break; 678 break;
777 } 679 }
680
681 thawer.next ();
778 } 682 }
779 683
780 abort (); 684 abort ();
781}
782
783bool
784maptile::_load_header (const char *path)
785{
786 object_thawer thawer (path);
787
788 if (!thawer)
789 return false;
790
791 return _load_header (thawer);
792} 685}
793 686
794/****************************************************************************** 687/******************************************************************************
795 * This is the start of unique map handling code 688 * This is the start of unique map handling code
796 *****************************************************************************/ 689 *****************************************************************************/
… …
807 object *above = op->above; 700 object *above = op->above;
808 701
809 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 702 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
810 unique = 1; 703 unique = 1;
811 704
812 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 705 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
813 { 706 {
814 op->destroy_inv (false); 707 op->destroy_inv (false);
815 op->destroy (); 708 op->destroy ();
816 } 709 }
817 710
… …
831 if (name) MAP_OUT (name); 724 if (name) MAP_OUT (name);
832 MAP_OUT (swap_time); 725 MAP_OUT (swap_time);
833 MAP_OUT (reset_time); 726 MAP_OUT (reset_time);
834 MAP_OUT (reset_timeout); 727 MAP_OUT (reset_timeout);
835 MAP_OUT (fixed_resettime); 728 MAP_OUT (fixed_resettime);
729 MAP_OUT (no_reset);
836 MAP_OUT (difficulty); 730 MAP_OUT (difficulty);
837 731
838 if (default_region) MAP_OUT2 (region, default_region->name); 732 if (default_region) MAP_OUT2 (region, default_region->name);
839 733
840 if (shopitems) 734 if (shopitems)
… …
894 * Remove and free all objects in the given map. 788 * Remove and free all objects in the given map.
895 */ 789 */
896void 790void
897maptile::clear () 791maptile::clear ()
898{ 792{
899 sfree (regions, size ()), regions = 0;
900 free (regionmap), regionmap = 0;
901
902 if (spaces) 793 if (spaces)
903 { 794 {
904 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 795 for (mapspace *ms = spaces + size (); ms-- > spaces; )
905 while (object *op = ms->bot) 796 while (object *op = ms->bot)
906 { 797 {
798 // manually remove, as to not trigger anything
799 if (ms->bot = op->above)
800 ms->bot->below = 0;
801
802 op->flag [FLAG_REMOVED] = true;
803
804 object *head = op->head_ ();
907 if (op->head) 805 if (op == head)
908 op = op->head; 806 {
909
910 op->destroy_inv (false); 807 op->destroy_inv (false);
911 op->destroy (); 808 op->destroy ();
809 }
810 else if (head->map != op->map)
811 {
812 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
813 head->destroy ();
814 }
912 } 815 }
913 816
914 sfree (spaces, size ()), spaces = 0; 817 sfree (spaces, size ()), spaces = 0;
915 } 818 }
916 819
917 if (buttons) 820 if (buttons)
918 free_objectlinkpt (buttons), buttons = 0; 821 free_objectlinkpt (buttons), buttons = 0;
822
823 sfree (regions, size ()); regions = 0;
824 delete [] regionmap; regionmap = 0;
919} 825}
920 826
921void 827void
922maptile::clear_header () 828maptile::clear_header ()
923{ 829{
… …
953maptile::do_destroy () 859maptile::do_destroy ()
954{ 860{
955 attachable::do_destroy (); 861 attachable::do_destroy ();
956 862
957 clear (); 863 clear ();
864}
865
866/* decay and destroy perishable items in a map */
867void
868maptile::do_decay_objects ()
869{
870 if (!spaces)
871 return;
872
873 for (mapspace *ms = spaces + size (); ms-- > spaces; )
874 for (object *above, *op = ms->bot; op; op = above)
875 {
876 above = op->above;
877
878 bool destroy = 0;
879
880 // do not decay anything above unique floor tiles (yet :)
881 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
882 break;
883
884 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
885 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
886 || QUERY_FLAG (op, FLAG_UNIQUE)
887 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
888 || QUERY_FLAG (op, FLAG_UNPAID)
889 || op->is_alive ())
890 ; // do not decay
891 else if (op->is_weapon ())
892 {
893 op->stats.dam--;
894 if (op->stats.dam < 0)
895 destroy = 1;
896 }
897 else if (op->is_armor ())
898 {
899 op->stats.ac--;
900 if (op->stats.ac < 0)
901 destroy = 1;
902 }
903 else if (op->type == FOOD)
904 {
905 op->stats.food -= rndm (5, 20);
906 if (op->stats.food < 0)
907 destroy = 1;
908 }
909 else
910 {
911 int mat = op->materials;
912
913 if (mat & M_PAPER
914 || mat & M_LEATHER
915 || mat & M_WOOD
916 || mat & M_ORGANIC
917 || mat & M_CLOTH
918 || mat & M_LIQUID
919 || (mat & M_IRON && rndm (1, 5) == 1)
920 || (mat & M_GLASS && rndm (1, 2) == 1)
921 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
922 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
923 || (mat & M_ICE && temp > 32))
924 destroy = 1;
925 }
926
927 /* adjust overall chance below */
928 if (destroy && rndm (0, 1))
929 op->destroy ();
930 }
958} 931}
959 932
960/* 933/*
961 * Updates every button on the map (by calling update_button() for them). 934 * Updates every button on the map (by calling update_button() for them).
962 */ 935 */
… …
1010 if (QUERY_FLAG (op, FLAG_GENERATOR)) 983 if (QUERY_FLAG (op, FLAG_GENERATOR))
1011 { 984 {
1012 total_exp += op->stats.exp; 985 total_exp += op->stats.exp;
1013 986
1014 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 987 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1015 total_exp += at->clone.stats.exp * 8; 988 total_exp += at->stats.exp * 8;
1016 989
1017 monster_cnt++; 990 monster_cnt++;
1018 } 991 }
1019 } 992 }
1020 993
… …
1075void 1048void
1076mapspace::update_ () 1049mapspace::update_ ()
1077{ 1050{
1078 object *tmp, *last = 0; 1051 object *tmp, *last = 0;
1079 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1052 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1080 faceidx top, floor, middle;
1081 object *top_obj, *floor_obj, *middle_obj;
1082 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1053 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1083 1054
1084 middle = blank_face; 1055 //object *middle = 0;
1085 top = blank_face; 1056 //object *top = 0;
1086 floor = blank_face; 1057 //object *floor = 0;
1087 1058 // this seems to generate better code than using locals, above
1088 middle_obj = 0; 1059 object *&top = faces_obj[0] = 0;
1089 top_obj = 0; 1060 object *&middle = faces_obj[1] = 0;
1090 floor_obj = 0; 1061 object *&floor = faces_obj[2] = 0;
1091 1062
1092 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1063 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1093 { 1064 {
1094 /* This could be made additive I guess (two lights better than 1065 /* This could be made additive I guess (two lights better than
1095 * one). But if so, it shouldn't be a simple additive - 2 1066 * one). But if so, it shouldn't be a simple additive - 2
… …
1108 * Always put the player down for drawing. 1079 * Always put the player down for drawing.
1109 */ 1080 */
1110 if (!tmp->invisible) 1081 if (!tmp->invisible)
1111 { 1082 {
1112 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1083 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1113 {
1114 top = tmp->face;
1115 top_obj = tmp; 1084 top = tmp;
1116 }
1117 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1085 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1118 { 1086 {
1119 /* If we got a floor, that means middle and top were below it, 1087 /* If we got a floor, that means middle and top were below it,
1120 * so should not be visible, so we clear them. 1088 * so should not be visible, so we clear them.
1121 */ 1089 */
1122 middle = blank_face; 1090 middle = 0;
1123 top = blank_face; 1091 top = 0;
1124 floor = tmp->face;
1125 floor_obj = tmp; 1092 floor = tmp;
1126 } 1093 }
1127 /* Flag anywhere have high priority */ 1094 /* Flag anywhere have high priority */
1128 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1095 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1129 { 1096 {
1130 middle = tmp->face;
1131
1132 middle_obj = tmp; 1097 middle = tmp;
1133 anywhere = 1; 1098 anywhere = 1;
1134 } 1099 }
1135 /* Find the highest visible face around. If equal 1100 /* Find the highest visible face around. If equal
1136 * visibilities, we still want the one nearer to the 1101 * visibilities, we still want the one nearer to the
1137 * top 1102 * top
1138 */ 1103 */
1139 else if (middle == blank_face || (::faces [tmp->face].visibility > ::faces [middle].visibility && !anywhere)) 1104 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1140 {
1141 middle = tmp->face;
1142 middle_obj = tmp; 1105 middle = tmp;
1143 }
1144 } 1106 }
1145 1107
1146 if (tmp == tmp->above) 1108 if (tmp == tmp->above)
1147 { 1109 {
1148 LOG (llevError, "Error in structure of map\n"); 1110 LOG (llevError, "Error in structure of map\n");
… …
1183 * middle face. This should not happen, as we already have the 1145 * middle face. This should not happen, as we already have the
1184 * else statement above so middle should not get set. OTOH, it 1146 * else statement above so middle should not get set. OTOH, it
1185 * may be possible for the faces to match but be different objects. 1147 * may be possible for the faces to match but be different objects.
1186 */ 1148 */
1187 if (top == middle) 1149 if (top == middle)
1188 middle = blank_face; 1150 middle = 0;
1189 1151
1190 /* There are three posibilities at this point: 1152 /* There are three posibilities at this point:
1191 * 1) top face is set, need middle to be set. 1153 * 1) top face is set, need middle to be set.
1192 * 2) middle is set, need to set top. 1154 * 2) middle is set, need to set top.
1193 * 3) neither middle or top is set - need to set both. 1155 * 3) neither middle or top is set - need to set both.
… …
1198 /* Once we get to a floor, stop, since we already have a floor object */ 1160 /* Once we get to a floor, stop, since we already have a floor object */
1199 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1161 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1200 break; 1162 break;
1201 1163
1202 /* If two top faces are already set, quit processing */ 1164 /* If two top faces are already set, quit processing */
1203 if ((top != blank_face) && (middle != blank_face)) 1165 if (top && middle)
1204 break; 1166 break;
1205 1167
1206 /* Only show visible faces */ 1168 /* Only show visible faces */
1207 if (!tmp->invisible) 1169 if (!tmp->invisible)
1208 { 1170 {
1209 /* Fill in top if needed */ 1171 /* Fill in top if needed */
1210 if (top == blank_face) 1172 if (!top)
1211 { 1173 {
1212 top = tmp->face;
1213 top_obj = tmp; 1174 top = tmp;
1214 if (top == middle) 1175 if (top == middle)
1215 middle = blank_face; 1176 middle = 0;
1216 } 1177 }
1217 else 1178 else
1218 { 1179 {
1219 /* top is already set - we should only get here if 1180 /* top is already set - we should only get here if
1220 * middle is not set 1181 * middle is not set
1221 * 1182 *
1222 * Set the middle face and break out, since there is nothing 1183 * Set the middle face and break out, since there is nothing
1223 * more to fill in. We don't check visiblity here, since 1184 * more to fill in. We don't check visiblity here, since
1224 * 1185 *
1225 */ 1186 */
1226 if (tmp->face != top) 1187 if (tmp != top)
1227 { 1188 {
1228 middle = tmp->face;
1229 middle_obj = tmp; 1189 middle = tmp;
1230 break; 1190 break;
1231 } 1191 }
1232 } 1192 }
1233 } 1193 }
1234 } 1194 }
1235 1195
1236 if (middle == floor) 1196 if (middle == floor)
1237 middle = blank_face; 1197 middle = 0;
1238 1198
1239 if (top == middle) 1199 if (top == middle)
1240 middle = blank_face; 1200 middle = 0;
1241 1201
1242 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1202#if 0
1243 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1203 faces_obj [0] = top;
1244 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1204 faces_obj [1] = middle;
1205 faces_obj [2] = floor;
1206#endif
1245} 1207}
1246 1208
1247uint64 1209uint64
1248mapspace::volume () const 1210mapspace::volume () const
1249{ 1211{
… …
1253 vol += op->volume (); 1215 vol += op->volume ();
1254 1216
1255 return vol; 1217 return vol;
1256} 1218}
1257 1219
1258/* this updates the orig_map->tile_map[tile_num] value after finding 1220bool
1259 * the map. It also takes care of linking back the freshly found 1221maptile::tile_available (int dir, bool load)
1260 * maps tile_map values if it tiles back to this one. It returns
1261 * the value of orig_map->tile_map[tile_num].
1262 */
1263static inline maptile *
1264find_and_link (maptile *orig_map, int tile_num)
1265{ 1222{
1266 maptile *mp = orig_map->tile_map [tile_num]; 1223 if (!tile_path[dir])
1224 return 0;
1267 1225
1268 if (!mp) 1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1269 { 1227 return 1;
1270 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1271 1228
1272 if (!mp) 1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1273 { 1230 return 1;
1274 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1275 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1276 &orig_map->tile_path[tile_num], &orig_map->path);
1277 mp = new maptile (1, 1);
1278 mp->alloc ();
1279 mp->in_memory = MAP_IN_MEMORY;
1280 }
1281 }
1282 1231
1283 int dest_tile = (tile_num + 2) % 4;
1284
1285 orig_map->tile_map [tile_num] = mp;
1286
1287 // optimisation: back-link map to origin map if euclidean
1288 //TODO: non-euclidean maps MUST GO
1289 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1290 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1291
1292 return mp; 1232 return 0;
1293}
1294
1295static inline void
1296load_and_link (maptile *orig_map, int tile_num)
1297{
1298 find_and_link (orig_map, tile_num)->load_sync ();
1299} 1233}
1300 1234
1301/* this returns TRUE if the coordinates (x,y) are out of 1235/* this returns TRUE if the coordinates (x,y) are out of
1302 * map m. This function also takes into account any 1236 * map m. This function also takes into account any
1303 * tiling considerations, loading adjacant maps as needed. 1237 * tiling considerations, loading adjacant maps as needed.
… …
1316 if (!m) 1250 if (!m)
1317 return 0; 1251 return 0;
1318 1252
1319 if (x < 0) 1253 if (x < 0)
1320 { 1254 {
1321 if (!m->tile_path[3]) 1255 if (!m->tile_available (3))
1322 return 1; 1256 return 1;
1323 1257
1324 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1325 find_and_link (m, 3);
1326
1327 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1258 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1328 } 1259 }
1329 1260
1330 if (x >= m->width) 1261 if (x >= m->width)
1331 { 1262 {
1332 if (!m->tile_path[1]) 1263 if (!m->tile_available (1))
1333 return 1; 1264 return 1;
1334 1265
1335 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1336 find_and_link (m, 1);
1337
1338 return out_of_map (m->tile_map[1], x - m->width, y); 1266 return out_of_map (m->tile_map[1], x - m->width, y);
1339 } 1267 }
1340 1268
1341 if (y < 0) 1269 if (y < 0)
1342 { 1270 {
1343 if (!m->tile_path[0]) 1271 if (!m->tile_available (0))
1344 return 1; 1272 return 1;
1345 1273
1346 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1347 find_and_link (m, 0);
1348
1349 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1274 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1350 } 1275 }
1351 1276
1352 if (y >= m->height) 1277 if (y >= m->height)
1353 { 1278 {
1354 if (!m->tile_path[2]) 1279 if (!m->tile_available (2))
1355 return 1; 1280 return 1;
1356
1357 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1358 find_and_link (m, 2);
1359 1281
1360 return out_of_map (m->tile_map[2], x, y - m->height); 1282 return out_of_map (m->tile_map[2], x, y - m->height);
1361 } 1283 }
1362 1284
1363 /* Simple case - coordinates are within this local 1285 /* Simple case - coordinates are within this local
… …
1377maptile * 1299maptile *
1378maptile::xy_find (sint16 &x, sint16 &y) 1300maptile::xy_find (sint16 &x, sint16 &y)
1379{ 1301{
1380 if (x < 0) 1302 if (x < 0)
1381 { 1303 {
1382 if (!tile_path[3]) 1304 if (!tile_available (3))
1383 return 0; 1305 return 0;
1384 1306
1385 find_and_link (this, 3);
1386 x += tile_map[3]->width; 1307 x += tile_map[3]->width;
1387 return tile_map[3]->xy_find (x, y); 1308 return tile_map[3]->xy_find (x, y);
1388 } 1309 }
1389 1310
1390 if (x >= width) 1311 if (x >= width)
1391 { 1312 {
1392 if (!tile_path[1]) 1313 if (!tile_available (1))
1393 return 0; 1314 return 0;
1394 1315
1395 find_and_link (this, 1);
1396 x -= width; 1316 x -= width;
1397 return tile_map[1]->xy_find (x, y); 1317 return tile_map[1]->xy_find (x, y);
1398 } 1318 }
1399 1319
1400 if (y < 0) 1320 if (y < 0)
1401 { 1321 {
1402 if (!tile_path[0]) 1322 if (!tile_available (0))
1403 return 0; 1323 return 0;
1404 1324
1405 find_and_link (this, 0);
1406 y += tile_map[0]->height; 1325 y += tile_map[0]->height;
1407 return tile_map[0]->xy_find (x, y); 1326 return tile_map[0]->xy_find (x, y);
1408 } 1327 }
1409 1328
1410 if (y >= height) 1329 if (y >= height)
1411 { 1330 {
1412 if (!tile_path[2]) 1331 if (!tile_available (2))
1413 return 0; 1332 return 0;
1414 1333
1415 find_and_link (this, 2);
1416 y -= height; 1334 y -= height;
1417 return tile_map[2]->xy_find (x, y); 1335 return tile_map[2]->xy_find (x, y);
1418 } 1336 }
1419 1337
1420 /* Simple case - coordinates are within this local 1338 /* Simple case - coordinates are within this local
… …
1431adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1349adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1432{ 1350{
1433 if (!map1 || !map2) 1351 if (!map1 || !map2)
1434 return 0; 1352 return 0;
1435 1353
1436 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1354 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1437 //fix: compare paths instead (this is likely faster, too!) 1355 //fix: compare paths instead (this is likely faster, too!)
1438 if (map1 == map2) 1356 if (map1 == map2)
1439 { 1357 {
1440 *dx = 0; 1358 *dx = 0;
1441 *dy = 0; 1359 *dy = 0;
… …
1695 1613
1696 // instead of crashing in the unlikely(?) case, try to return *something* 1614 // instead of crashing in the unlikely(?) case, try to return *something*
1697 return get_archetype ("blocked"); 1615 return get_archetype ("blocked");
1698} 1616}
1699 1617
1618void
1619maptile::play_sound (faceidx sound, int x, int y) const
1620{
1621 if (!sound)
1622 return;
1623
1624 for_all_players (pl)
1625 if (pl->ob->map == this)
1626 if (client *ns = pl->ns)
1627 {
1628 int dx = x - pl->ob->x;
1629 int dy = y - pl->ob->y;
1630
1631 int distance = idistance (dx, dy);
1632
1633 if (distance <= MAX_SOUND_DISTANCE)
1634 ns->play_sound (sound, dx, dy);
1635 }
1636}
1637

Diff Legend

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