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.160 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include "global.h" 27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h" 28#include "loader.h"
31
32#include "path.h" 29#include "path.h"
33 30
34/* 31sint8 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 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
… …
324 245
325 insert_ob_in_ob (tmp, container); 246 insert_ob_in_ob (tmp, container);
326 tmp = next; 247 tmp = next;
327 } 248 }
328 249
329 /* sum_weight will go through and calculate what all the containers are 250 // go through and calculate what all the containers are carrying.
330 * carrying. 251 //TODO: remove
331 */ 252 container->update_weight ();
332 sum_weight (container);
333} 253}
334 254
335void 255void
336maptile::set_object_flag (int flag, int value) 256maptile::set_object_flag (int flag, int value)
337{ 257{
… …
341 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 261 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 262 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value; 263 tmp->flag [flag] = value;
344} 264}
345 265
266void
267maptile::post_load_original ()
268{
269 if (!spaces)
270 return;
271
272 set_object_flag (FLAG_OBJ_ORIGINAL);
273
274 for (mapspace *ms = spaces + size (); ms-- > spaces; )
275 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
276 INVOKE_OBJECT (RESET, tmp);
277}
278
346/* link_multipart_objects go through all the objects on the map looking 279/* 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 280 * 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 281 * 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 282 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 283 */
352void 284void
353maptile::link_multipart_objects () 285maptile::link_multipart_objects ()
354{ 286{
355 if (!spaces) 287 if (!spaces)
356 return; 288 return;
357 289
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 290 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 291 {
292 object *op = ms->bot;
293 while (op)
360 { 294 {
361 /* already multipart - don't do anything more */ 295 /* already multipart - don't do anything more */
362 if (!tmp->head && !tmp->more) 296 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 { 297 {
373 op = arch_to_object (at); 298 op->remove ();
299 op->expand_tail ();
374 300
375 /* update x,y coordinates */ 301 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
376 op->x += tmp->x; 302 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
377 op->y += tmp->y; 303 // 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); 304 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
305
306 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
307 // so we have to reset the iteration through the mapspace
390 } 308 }
309 else
310 op = op->above;
391 } 311 }
392 } 312 }
393} 313}
394 314
395/* 315/*
396 * Loads (ands parses) the objects into a given map from the specified 316 * Loads (ands parses) the objects into a given map from the specified
397 * file pointer. 317 * file pointer.
… …
399bool 319bool
400maptile::_load_objects (object_thawer &f) 320maptile::_load_objects (object_thawer &f)
401{ 321{
402 for (;;) 322 for (;;)
403 { 323 {
404 coroapi::cede_every (1000); // cede once in a while 324 coroapi::cede_to_tick (); // cede once in a while
405 325
406 switch (f.kw) 326 switch (f.kw)
407 { 327 {
408 case KW_arch: 328 case KW_arch:
409 if (object *op = object::read (f, this)) 329 if (object *op = object::read (f, this))
410 { 330 {
331 // TODO: why?
411 if (op->inv) 332 if (op->inv)
412 sum_weight (op); 333 op->update_weight ();
413 334
414 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 335 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
336 {
337 // we insert manually because
338 // a) its way faster
339 // b) we remove manually, too, and there are good reasons for that
340 // c) it's correct
341 mapspace &ms = at (op->x, op->y);
342
343 op->flag [FLAG_REMOVED] = false;
344
345 op->above = 0;
346 op->below = ms.top;
347
348 *(ms.top ? &ms.top->above : &ms.bot) = op;
349
350 ms.top = op;
351 ms.flags_ = 0;
352 }
353 else
354 {
355 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
356 op->destroy ();
357 }
415 } 358 }
416 359
417 continue; 360 continue;
418 361
419 case KW_EOF: 362 case KW_EOF:
… …
432} 375}
433 376
434void 377void
435maptile::activate () 378maptile::activate ()
436{ 379{
437 if (!spaces) 380 if (spaces)
438 return;
439
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 381 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 382 for (object *op = ms->bot; op; op = op->above)
442 op->activate_recursive (); 383 op->activate_recursive ();
443} 384}
444 385
445void 386void
446maptile::deactivate () 387maptile::deactivate ()
447{ 388{
448 if (!spaces) 389 if (spaces)
449 return;
450
451 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 390 for (mapspace *ms = spaces + size (); ms-- > spaces; )
452 for (object *op = ms->bot; op; op = op->above) 391 for (object *op = ms->bot; op; op = op->above)
453 op->deactivate_recursive (); 392 op->deactivate_recursive ();
454} 393}
455 394
456bool 395bool
457maptile::_save_objects (object_freezer &f, int flags) 396maptile::_save_objects (object_freezer &f, int flags)
458{ 397{
459 static int cede_count = 0; 398 coroapi::cede_to_tick ();
460 399
461 if (flags & IO_HEADER) 400 if (flags & IO_HEADER)
462 _save_header (f); 401 _save_header (f);
463 402
464 if (!spaces) 403 if (!spaces)
465 return false; 404 return false;
466 405
467 for (int i = 0; i < size (); ++i) 406 for (int i = 0; i < size (); ++i)
468 { 407 {
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; 408 bool unique = 0;
409
478 for (object *op = spaces [i].bot; op; op = op->above) 410 for (object *op = spaces [i].bot; op; op = op->above)
479 { 411 {
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]) 412 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
484 unique = 1;
485 413
486 if (!op->can_map_save ()) 414 if (expect_false (!op->can_map_save ()))
487 continue; 415 continue;
488 416
489 if (unique || op->flag [FLAG_UNIQUE]) 417 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
490 { 418 {
491 if (flags & IO_UNIQUES) 419 if (flags & IO_UNIQUES)
492 op->write (f); 420 op->write (f);
493 } 421 }
494 else if (flags & IO_OBJECTS) 422 else if (expect_true (flags & IO_OBJECTS))
495 op->write (f); 423 op->write (f);
496 } 424 }
497 } 425 }
498 426
427 coroapi::cede_to_tick ();
428
499 return true; 429 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} 430}
523 431
524bool 432bool
525maptile::_save_objects (const char *path, int flags) 433maptile::_save_objects (const char *path, int flags)
526{ 434{
… …
701bool 609bool
702maptile::_load_header (object_thawer &thawer) 610maptile::_load_header (object_thawer &thawer)
703{ 611{
704 for (;;) 612 for (;;)
705 { 613 {
706 keyword kw = thawer.get_kv ();
707
708 switch (kw) 614 switch (thawer.kw)
709 { 615 {
710 case KW_msg: 616 case KW_msg:
711 thawer.get_ml (KW_endmsg, msg); 617 thawer.get_ml (KW_endmsg, msg);
712 break; 618 break;
713 619
… …
745 case KW_winddir: thawer.get (winddir); break; 651 case KW_winddir: thawer.get (winddir); break;
746 case KW_sky: thawer.get (sky); break; 652 case KW_sky: thawer.get (sky); break;
747 653
748 case KW_per_player: thawer.get (per_player); break; 654 case KW_per_player: thawer.get (per_player); break;
749 case KW_per_party: thawer.get (per_party); break; 655 case KW_per_party: thawer.get (per_party); break;
656 case KW_no_reset: thawer.get (no_reset); break;
657 case KW_no_drop: thawer.get (no_drop); break;
750 658
751 case KW_region: default_region = region::find (thawer.get_str ()); break; 659 case KW_region: default_region = region::find (thawer.get_str ()); break;
752 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 660 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
753 661
754 // old names new names 662 // old names new names
… …
765 case KW_tile_path_1: thawer.get (tile_path [0]); break; 673 case KW_tile_path_1: thawer.get (tile_path [0]); break;
766 case KW_tile_path_2: thawer.get (tile_path [1]); break; 674 case KW_tile_path_2: thawer.get (tile_path [1]); break;
767 case KW_tile_path_3: thawer.get (tile_path [2]); break; 675 case KW_tile_path_3: thawer.get (tile_path [2]); break;
768 case KW_tile_path_4: thawer.get (tile_path [3]); break; 676 case KW_tile_path_4: thawer.get (tile_path [3]); break;
769 677
678 case KW_ERROR:
679 set_key_text (thawer.kw_str, thawer.value);
680 break;
681
770 case KW_end: 682 case KW_end:
683 thawer.next ();
771 return true; 684 return true;
772 685
773 default: 686 default:
774 if (!thawer.parse_error ("map", 0)) 687 if (!thawer.parse_error ("map", 0))
775 return false; 688 return false;
776 break; 689 break;
777 } 690 }
691
692 thawer.next ();
778 } 693 }
779 694
780 abort (); 695 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} 696}
793 697
794/****************************************************************************** 698/******************************************************************************
795 * This is the start of unique map handling code 699 * This is the start of unique map handling code
796 *****************************************************************************/ 700 *****************************************************************************/
… …
807 object *above = op->above; 711 object *above = op->above;
808 712
809 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 713 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
810 unique = 1; 714 unique = 1;
811 715
812 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 716 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
813 {
814 op->destroy_inv (false);
815 op->destroy (); 717 op->destroy ();
816 }
817 718
818 op = above; 719 op = above;
819 } 720 }
820 } 721 }
821} 722}
… …
831 if (name) MAP_OUT (name); 732 if (name) MAP_OUT (name);
832 MAP_OUT (swap_time); 733 MAP_OUT (swap_time);
833 MAP_OUT (reset_time); 734 MAP_OUT (reset_time);
834 MAP_OUT (reset_timeout); 735 MAP_OUT (reset_timeout);
835 MAP_OUT (fixed_resettime); 736 MAP_OUT (fixed_resettime);
737 MAP_OUT (no_reset);
738 MAP_OUT (no_drop);
836 MAP_OUT (difficulty); 739 MAP_OUT (difficulty);
837 740
838 if (default_region) MAP_OUT2 (region, default_region->name); 741 if (default_region) MAP_OUT2 (region, default_region->name);
839 742
840 if (shopitems) 743 if (shopitems)
… …
894 * Remove and free all objects in the given map. 797 * Remove and free all objects in the given map.
895 */ 798 */
896void 799void
897maptile::clear () 800maptile::clear ()
898{ 801{
899 sfree (regions, size ()), regions = 0;
900 free (regionmap), regionmap = 0;
901
902 if (spaces) 802 if (spaces)
903 { 803 {
904 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 804 for (mapspace *ms = spaces + size (); ms-- > spaces; )
905 while (object *op = ms->bot) 805 while (object *op = ms->bot)
906 { 806 {
807 // manually remove, as to not trigger anything
808 if (ms->bot = op->above)
809 ms->bot->below = 0;
810
811 op->flag [FLAG_REMOVED] = true;
812
813 object *head = op->head_ ();
907 if (op->head) 814 if (op == head)
908 op = op->head;
909
910 op->destroy_inv (false);
911 op->destroy (); 815 op->destroy ();
816 else if (head->map != op->map)
817 {
818 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
819 head->destroy ();
820 }
912 } 821 }
913 822
914 sfree (spaces, size ()), spaces = 0; 823 sfree0 (spaces, size ());
915 } 824 }
916 825
917 if (buttons) 826 if (buttons)
918 free_objectlinkpt (buttons), buttons = 0; 827 free_objectlinkpt (buttons), buttons = 0;
828
829 sfree0 (regions, size ());
830 delete [] regionmap; regionmap = 0;
919} 831}
920 832
921void 833void
922maptile::clear_header () 834maptile::clear_header ()
923{ 835{
… …
955 attachable::do_destroy (); 867 attachable::do_destroy ();
956 868
957 clear (); 869 clear ();
958} 870}
959 871
960/* 872/* decay and destroy perishable items in a map */
961 * Updates every button on the map (by calling update_button() for them).
962 */
963void 873void
964maptile::update_buttons () 874maptile::do_decay_objects ()
965{ 875{
966 for (oblinkpt *obp = buttons; obp; obp = obp->next) 876 if (!spaces)
967 for (objectlink *ol = obp->link; ol; ol = ol->next) 877 return;
878
879 for (mapspace *ms = spaces + size (); ms-- > spaces; )
880 for (object *above, *op = ms->bot; op; op = above)
968 { 881 {
969 if (!ol->ob) 882 above = op->above;
883
884 bool destroy = 0;
885
886 // do not decay anything above unique floor tiles (yet :)
887 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
888 break;
889
890 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
891 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
892 || QUERY_FLAG (op, FLAG_UNIQUE)
893 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
894 || QUERY_FLAG (op, FLAG_UNPAID)
895 || op->is_alive ())
896 ; // do not decay
897 else if (op->is_weapon ())
970 { 898 {
971 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 899 op->stats.dam--;
972 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 900 if (op->stats.dam < 0)
973 continue; 901 destroy = 1;
974 } 902 }
975 903 else if (op->is_armor ())
976 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
977 { 904 {
978 update_button (ol->ob); 905 op->stats.ac--;
979 break; 906 if (op->stats.ac < 0)
907 destroy = 1;
980 } 908 }
909 else if (op->type == FOOD)
910 {
911 op->stats.food -= rndm (5, 20);
912 if (op->stats.food < 0)
913 destroy = 1;
914 }
915 else
916 {
917 int mat = op->materials;
918
919 if (mat & M_PAPER
920 || mat & M_LEATHER
921 || mat & M_WOOD
922 || mat & M_ORGANIC
923 || mat & M_CLOTH
924 || mat & M_LIQUID
925 || (mat & M_IRON && rndm (1, 5) == 1)
926 || (mat & M_GLASS && rndm (1, 2) == 1)
927 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
928 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
929 || (mat & M_ICE && temp > 32))
930 destroy = 1;
931 }
932
933 /* adjust overall chance below */
934 if (destroy && rndm (0, 1))
935 op->destroy ();
981 } 936 }
982} 937}
983 938
984/* 939/*
985 * This routine is supposed to find out the difficulty of the map. 940 * This routine is supposed to find out the difficulty of the map.
986 * difficulty does not have a lot to do with character level, 941 * difficulty does not have a lot to do with character level,
987 * but does have a lot to do with treasure on the map. 942 * but does have a lot to do with treasure on the map.
988 * 943 *
989 * Difficulty can now be set by the map creature. If the value stored 944 * Difficulty can now be set by the map creator. If the value stored
990 * in the map is zero, then use this routine. Maps should really 945 * in the map is zero, then use this routine. Maps should really
991 * have a difficulty set than using this function - human calculation 946 * have a difficulty set rather than using this function - human calculation
992 * is much better than this functions guesswork. 947 * is much better than this function's guesswork.
993 */ 948 */
994int 949int
995maptile::estimate_difficulty () const 950maptile::estimate_difficulty () const
996{ 951{
997 long monster_cnt = 0; 952 long monster_cnt = 0;
… …
1009 964
1010 if (QUERY_FLAG (op, FLAG_GENERATOR)) 965 if (QUERY_FLAG (op, FLAG_GENERATOR))
1011 { 966 {
1012 total_exp += op->stats.exp; 967 total_exp += op->stats.exp;
1013 968
1014 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 969 if (archetype *at = op->other_arch)
970 {
1015 total_exp += at->clone.stats.exp * 8; 971 total_exp += at->stats.exp * 8;
1016
1017 monster_cnt++; 972 monster_cnt++;
973 }
974
975 for (object *inv = op->inv; inv; inv = inv->below)
976 {
977 total_exp += op->stats.exp * 8;
978 monster_cnt++;
979 }
1018 } 980 }
1019 } 981 }
1020 982
1021 avgexp = (double) total_exp / monster_cnt; 983 avgexp = (double) total_exp / monster_cnt;
1022 984
… …
1035 * postive values make it darker, negative make it brighter 997 * postive values make it darker, negative make it brighter
1036 */ 998 */
1037int 999int
1038maptile::change_map_light (int change) 1000maptile::change_map_light (int change)
1039{ 1001{
1040 int new_level = darkness + change;
1041
1042 /* Nothing to do */ 1002 /* Nothing to do */
1043 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1003 if (!change)
1044 return 0; 1004 return 0;
1045 1005
1046 /* inform all players on the map */ 1006 /* inform all players on the map */
1047 if (change > 0) 1007 if (change > 0)
1048 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1008 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1049 else 1009 else
1050 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1010 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1051 1011
1052 /* Do extra checking. since darkness is a unsigned value, 1012 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1053 * we need to be extra careful about negative values.
1054 * In general, the checks below are only needed if change
1055 * is not +/-1
1056 */
1057 if (new_level < 0)
1058 darkness = 0;
1059 else if (new_level >= MAX_DARKNESS)
1060 darkness = MAX_DARKNESS;
1061 else
1062 darkness = new_level;
1063 1013
1064 /* All clients need to get re-updated for the change */ 1014 /* All clients need to get re-updated for the change */
1065 update_all_map_los (this); 1015 update_all_map_los (this);
1016
1066 return 1; 1017 return 1;
1067} 1018}
1068 1019
1069/* 1020/*
1070 * This function updates various attributes about a specific space 1021 * This function updates various attributes about a specific space
… …
1073 * through, etc) 1024 * through, etc)
1074 */ 1025 */
1075void 1026void
1076mapspace::update_ () 1027mapspace::update_ ()
1077{ 1028{
1078 object *tmp, *last = 0; 1029 object *last = 0;
1079 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1030 uint8 flags = P_UPTODATE, anywhere = 0;
1080 faceidx top, floor, middle; 1031 sint8 light = 0;
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; 1032 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1083 1033
1084 middle = blank_face; 1034 //object *middle = 0;
1085 top = blank_face; 1035 //object *top = 0;
1086 floor = blank_face; 1036 //object *floor = 0;
1037 // this seems to generate better code than using locals, above
1038 object *&top = faces_obj[0] = 0;
1039 object *&middle = faces_obj[1] = 0;
1040 object *&floor = faces_obj[2] = 0;
1087 1041
1088 middle_obj = 0;
1089 top_obj = 0;
1090 floor_obj = 0;
1091
1092 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1042 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1093 { 1043 {
1094 /* This could be made additive I guess (two lights better than 1044 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1095 * one). But if so, it shouldn't be a simple additive - 2
1096 * light bulbs do not illuminate twice as far as once since
1097 * it is a dissapation factor that is cubed.
1098 */
1099 if (tmp->glow_radius > light)
1100 light = tmp->glow_radius; 1045 light += tmp->glow_radius;
1101 1046
1102 /* This call is needed in order to update objects the player 1047 /* This call is needed in order to update objects the player
1103 * is standing in that have animations (ie, grass, fire, etc). 1048 * is standing in that have animations (ie, grass, fire, etc).
1104 * However, it also causes the look window to be re-drawn 1049 * However, it also causes the look window to be re-drawn
1105 * 3 times each time the player moves, because many of the 1050 * 3 times each time the player moves, because many of the
… …
1108 * Always put the player down for drawing. 1053 * Always put the player down for drawing.
1109 */ 1054 */
1110 if (!tmp->invisible) 1055 if (!tmp->invisible)
1111 { 1056 {
1112 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1057 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1113 {
1114 top = tmp->face;
1115 top_obj = tmp; 1058 top = tmp;
1116 }
1117 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1059 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1118 { 1060 {
1119 /* If we got a floor, that means middle and top were below it, 1061 /* If we got a floor, that means middle and top were below it,
1120 * so should not be visible, so we clear them. 1062 * so should not be visible, so we clear them.
1121 */ 1063 */
1122 middle = blank_face; 1064 middle = 0;
1123 top = blank_face; 1065 top = 0;
1124 floor = tmp->face;
1125 floor_obj = tmp; 1066 floor = tmp;
1126 } 1067 }
1127 /* Flag anywhere have high priority */ 1068 /* Flag anywhere have high priority */
1128 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1069 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1129 { 1070 {
1130 middle = tmp->face;
1131
1132 middle_obj = tmp; 1071 middle = tmp;
1133 anywhere = 1; 1072 anywhere = 1;
1134 } 1073 }
1074
1135 /* Find the highest visible face around. If equal 1075 /* Find the highest visible face around. If equal
1136 * visibilities, we still want the one nearer to the 1076 * visibilities, we still want the one nearer to the
1137 * top 1077 * top
1138 */ 1078 */
1139 else if (middle == blank_face || (::faces [tmp->face].visibility > ::faces [middle].visibility && !anywhere)) 1079 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1140 {
1141 middle = tmp->face;
1142 middle_obj = tmp; 1080 middle = tmp;
1143 }
1144 } 1081 }
1145 1082
1146 if (tmp == tmp->above) 1083 if (tmp == tmp->above)
1147 { 1084 {
1148 LOG (llevError, "Error in structure of map\n"); 1085 LOG (llevError, "Error in structure of map\n");
… …
1161 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1098 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1162 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1099 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1163 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1100 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1164 } 1101 }
1165 1102
1166 this->light = light; 1103 this->light = min (light, MAX_LIGHT_RADIUS);
1167 this->flags_ = flags; 1104 this->flags_ = flags;
1168 this->move_block = move_block & ~move_allow; 1105 this->move_block = move_block & ~move_allow;
1169 this->move_on = move_on; 1106 this->move_on = move_on;
1170 this->move_off = move_off; 1107 this->move_off = move_off;
1171 this->move_slow = move_slow; 1108 this->move_slow = move_slow;
… …
1183 * middle face. This should not happen, as we already have the 1120 * middle face. This should not happen, as we already have the
1184 * else statement above so middle should not get set. OTOH, it 1121 * else statement above so middle should not get set. OTOH, it
1185 * may be possible for the faces to match but be different objects. 1122 * may be possible for the faces to match but be different objects.
1186 */ 1123 */
1187 if (top == middle) 1124 if (top == middle)
1188 middle = blank_face; 1125 middle = 0;
1189 1126
1190 /* There are three posibilities at this point: 1127 /* There are three posibilities at this point:
1191 * 1) top face is set, need middle to be set. 1128 * 1) top face is set, need middle to be set.
1192 * 2) middle is set, need to set top. 1129 * 2) middle is set, need to set top.
1193 * 3) neither middle or top is set - need to set both. 1130 * 3) neither middle or top is set - need to set both.
1194 */ 1131 */
1195 1132
1196 for (tmp = last; tmp; tmp = tmp->below) 1133 for (object *tmp = last; tmp; tmp = tmp->below)
1197 { 1134 {
1198 /* Once we get to a floor, stop, since we already have a floor object */ 1135 /* Once we get to a floor, stop, since we already have a floor object */
1199 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1136 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1200 break; 1137 break;
1201 1138
1202 /* If two top faces are already set, quit processing */ 1139 /* If two top faces are already set, quit processing */
1203 if ((top != blank_face) && (middle != blank_face)) 1140 if (top && middle)
1204 break; 1141 break;
1205 1142
1206 /* Only show visible faces */ 1143 /* Only show visible faces */
1207 if (!tmp->invisible) 1144 if (!tmp->invisible)
1208 { 1145 {
1209 /* Fill in top if needed */ 1146 /* Fill in top if needed */
1210 if (top == blank_face) 1147 if (!top)
1211 { 1148 {
1212 top = tmp->face;
1213 top_obj = tmp; 1149 top = tmp;
1214 if (top == middle) 1150 if (top == middle)
1215 middle = blank_face; 1151 middle = 0;
1216 } 1152 }
1217 else 1153 else
1218 { 1154 {
1219 /* top is already set - we should only get here if 1155 /* top is already set - we should only get here if
1220 * middle is not set 1156 * middle is not set
1221 * 1157 *
1222 * Set the middle face and break out, since there is nothing 1158 * Set the middle face and break out, since there is nothing
1223 * more to fill in. We don't check visiblity here, since 1159 * more to fill in. We don't check visiblity here, since
1224 * 1160 *
1225 */ 1161 */
1226 if (tmp->face != top) 1162 if (tmp != top)
1227 { 1163 {
1228 middle = tmp->face;
1229 middle_obj = tmp; 1164 middle = tmp;
1230 break; 1165 break;
1231 } 1166 }
1232 } 1167 }
1233 } 1168 }
1234 } 1169 }
1235 1170
1236 if (middle == floor) 1171 if (middle == floor)
1237 middle = blank_face; 1172 middle = 0;
1238 1173
1239 if (top == middle) 1174 if (top == middle)
1240 middle = blank_face; 1175 middle = 0;
1241 1176
1242 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1177#if 0
1243 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1178 faces_obj [0] = top;
1244 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1179 faces_obj [1] = middle;
1180 faces_obj [2] = floor;
1181#endif
1245} 1182}
1246 1183
1247uint64 1184uint64
1248mapspace::volume () const 1185mapspace::volume () const
1249{ 1186{
… …
1253 vol += op->volume (); 1190 vol += op->volume ();
1254 1191
1255 return vol; 1192 return vol;
1256} 1193}
1257 1194
1258/* this updates the orig_map->tile_map[tile_num] value after finding 1195maptile *
1259 * the map. It also takes care of linking back the freshly found 1196maptile::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{ 1197{
1266 maptile *mp = orig_map->tile_map [tile_num]; 1198 if (tile_path[dir])
1267
1268 if (!mp)
1269 {
1270 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1271
1272 if (!mp)
1273 {
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 } 1199 {
1200 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1201 return tile_map[dir];
1282 1202
1283 int dest_tile = (tile_num + 2) % 4; 1203 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1204 return tile_map[dir];
1205 }
1284 1206
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; 1207 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} 1208}
1300 1209
1301/* this returns TRUE if the coordinates (x,y) are out of 1210/* this returns TRUE if the coordinates (x,y) are out of
1302 * map m. This function also takes into account any 1211 * map m. This function also takes into account any
1303 * tiling considerations, loading adjacant maps as needed. 1212 * tiling considerations, loading adjacant maps as needed.
… …
1316 if (!m) 1225 if (!m)
1317 return 0; 1226 return 0;
1318 1227
1319 if (x < 0) 1228 if (x < 0)
1320 { 1229 {
1321 if (!m->tile_path[3]) 1230 if (!m->tile_available (3))
1322 return 1; 1231 return 1;
1323 1232
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); 1233 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1328 } 1234 }
1329 1235
1330 if (x >= m->width) 1236 if (x >= m->width)
1331 { 1237 {
1332 if (!m->tile_path[1]) 1238 if (!m->tile_available (1))
1333 return 1; 1239 return 1;
1334 1240
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); 1241 return out_of_map (m->tile_map[1], x - m->width, y);
1339 } 1242 }
1340 1243
1341 if (y < 0) 1244 if (y < 0)
1342 { 1245 {
1343 if (!m->tile_path[0]) 1246 if (!m->tile_available (0))
1344 return 1; 1247 return 1;
1345 1248
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); 1249 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1350 } 1250 }
1351 1251
1352 if (y >= m->height) 1252 if (y >= m->height)
1353 { 1253 {
1354 if (!m->tile_path[2]) 1254 if (!m->tile_available (2))
1355 return 1; 1255 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 1256
1360 return out_of_map (m->tile_map[2], x, y - m->height); 1257 return out_of_map (m->tile_map[2], x, y - m->height);
1361 } 1258 }
1362 1259
1363 /* Simple case - coordinates are within this local 1260 /* Simple case - coordinates are within this local
… …
1377maptile * 1274maptile *
1378maptile::xy_find (sint16 &x, sint16 &y) 1275maptile::xy_find (sint16 &x, sint16 &y)
1379{ 1276{
1380 if (x < 0) 1277 if (x < 0)
1381 { 1278 {
1382 if (!tile_path[3]) 1279 if (!tile_available (3))
1383 return 0; 1280 return 0;
1384 1281
1385 find_and_link (this, 3);
1386 x += tile_map[3]->width; 1282 x += tile_map[3]->width;
1387 return tile_map[3]->xy_find (x, y); 1283 return tile_map[3]->xy_find (x, y);
1388 } 1284 }
1389 1285
1390 if (x >= width) 1286 if (x >= width)
1391 { 1287 {
1392 if (!tile_path[1]) 1288 if (!tile_available (1))
1393 return 0; 1289 return 0;
1394 1290
1395 find_and_link (this, 1);
1396 x -= width; 1291 x -= width;
1397 return tile_map[1]->xy_find (x, y); 1292 return tile_map[1]->xy_find (x, y);
1398 } 1293 }
1399 1294
1400 if (y < 0) 1295 if (y < 0)
1401 { 1296 {
1402 if (!tile_path[0]) 1297 if (!tile_available (0))
1403 return 0; 1298 return 0;
1404 1299
1405 find_and_link (this, 0);
1406 y += tile_map[0]->height; 1300 y += tile_map[0]->height;
1407 return tile_map[0]->xy_find (x, y); 1301 return tile_map[0]->xy_find (x, y);
1408 } 1302 }
1409 1303
1410 if (y >= height) 1304 if (y >= height)
1411 { 1305 {
1412 if (!tile_path[2]) 1306 if (!tile_available (2))
1413 return 0; 1307 return 0;
1414 1308
1415 find_and_link (this, 2);
1416 y -= height; 1309 y -= height;
1417 return tile_map[2]->xy_find (x, y); 1310 return tile_map[2]->xy_find (x, y);
1418 } 1311 }
1419 1312
1420 /* Simple case - coordinates are within this local 1313 /* Simple case - coordinates are within this local
… …
1431adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1324adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1432{ 1325{
1433 if (!map1 || !map2) 1326 if (!map1 || !map2)
1434 return 0; 1327 return 0;
1435 1328
1436 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1329 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1437 //fix: compare paths instead (this is likely faster, too!) 1330 //fix: compare paths instead (this is likely faster, too!)
1438 if (map1 == map2) 1331 if (map1 == map2)
1439 { 1332 {
1440 *dx = 0; 1333 *dx = 0;
1441 *dy = 0; 1334 *dy = 0;
… …
1623 else 1516 else
1624 { 1517 {
1625 retval->distance_x += op2->x - x; 1518 retval->distance_x += op2->x - x;
1626 retval->distance_y += op2->y - y; 1519 retval->distance_y += op2->y - y;
1627 1520
1628 retval->part = NULL; 1521 retval->part = 0;
1629 retval->distance = idistance (retval->distance_x, retval->distance_y); 1522 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1630 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1523 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1631 } 1524 }
1632} 1525}
1633 1526
1634/* Returns true of op1 and op2 are effectively on the same map 1527/* Returns true of op1 and op2 are effectively on the same map
… …
1648} 1541}
1649 1542
1650object * 1543object *
1651maptile::insert (object *op, int x, int y, object *originator, int flags) 1544maptile::insert (object *op, int x, int y, object *originator, int flags)
1652{ 1545{
1653 if (!op->flag [FLAG_REMOVED])
1654 op->remove ();
1655
1656 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1546 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1657} 1547}
1658 1548
1659region * 1549region *
1660maptile::region (int x, int y) const 1550maptile::region (int x, int y) const
… …
1670 1560
1671 return ::region::default_region (); 1561 return ::region::default_region ();
1672} 1562}
1673 1563
1674/* picks a random object from a style map. 1564/* picks a random object from a style map.
1675 * Redone by MSW so it should be faster and not use static
1676 * variables to generate tables.
1677 */ 1565 */
1678object * 1566object *
1679maptile::pick_random_object () const 1567maptile::pick_random_object (rand_gen &gen) const
1680{ 1568{
1681 /* while returning a null object will result in a crash, that 1569 /* while returning a null object will result in a crash, that
1682 * is actually preferable to an infinite loop. That is because 1570 * is actually preferable to an infinite loop. That is because
1683 * most servers will automatically restart in case of crash. 1571 * most servers will automatically restart in case of crash.
1684 * Change the logic on getting the random space - shouldn't make 1572 * Change the logic on getting the random space - shouldn't make
1685 * any difference, but this seems clearer to me. 1573 * any difference, but this seems clearer to me.
1686 */ 1574 */
1687 for (int i = 1000; --i;) 1575 for (int i = 1000; --i;)
1688 { 1576 {
1689 object *pick = at (rndm (width), rndm (height)).bot; 1577 object *pick = at (gen (width), gen (height)).bot;
1690 1578
1691 // do not prefer big monsters just because they are big. 1579 // do not prefer big monsters just because they are big.
1692 if (pick && pick->head_ () == pick) 1580 if (pick && pick->is_head ())
1693 return pick->head_ (); 1581 return pick->head_ ();
1694 } 1582 }
1695 1583
1696 // instead of crashing in the unlikely(?) case, try to return *something* 1584 // instead of crashing in the unlikely(?) case, try to return *something*
1697 return get_archetype ("blocked"); 1585 return archetype::find ("bug");
1698} 1586}
1699 1587
1588void
1589maptile::play_sound (faceidx sound, int x, int y) const
1590{
1591 if (!sound)
1592 return;
1593
1594 for_all_players_on_map (pl, this)
1595 if (client *ns = pl->ns)
1596 {
1597 int dx = x - pl->ob->x;
1598 int dy = y - pl->ob->y;
1599
1600 int distance = idistance (dx, dy);
1601
1602 if (distance <= MAX_SOUND_DISTANCE)
1603 ns->play_sound (sound, dx, dy);
1604 }
1605}
1606
1607void
1608maptile::say_msg (const char *msg, int x, int y) const
1609{
1610 for_all_players (pl)
1611 if (client *ns = pl->ns)
1612 {
1613 int dx = x - pl->ob->x;
1614 int dy = y - pl->ob->y;
1615
1616 int distance = idistance (dx, dy);
1617
1618 if (distance <= MAX_SOUND_DISTANCE)
1619 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1620 }
1621}
1622
1623static void
1624split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1625{
1626 // clip to map to the left
1627 if (x0 < 0)
1628 {
1629 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1630 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1631
1632 if (x1 < 0) // entirely to the left
1633 return;
1634
1635 x0 = 0;
1636 }
1637
1638 // clip to map to the right
1639 if (x1 > m->width)
1640 {
1641 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1642 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1643
1644 if (x0 > m->width) // entirely to the right
1645 return;
1646
1647 x1 = m->width;
1648 }
1649
1650 // clip to map above
1651 if (y0 < 0)
1652 {
1653 if (maptile *tile = m->tile_available (TILE_UP, 1))
1654 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1655
1656 if (y1 < 0) // entirely above
1657 return;
1658
1659 y0 = 0;
1660 }
1661
1662 // clip to map below
1663 if (y1 > m->height)
1664 {
1665 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1666 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1667
1668 if (y0 > m->height) // entirely below
1669 return;
1670
1671 y1 = m->height;
1672 }
1673
1674 // if we get here, the rect is within the current map
1675 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1676
1677 r->m = m;
1678 r->x0 = x0;
1679 r->y0 = y0;
1680 r->x1 = x1;
1681 r->y1 = y1;
1682 r->dx = dx;
1683 r->dy = dy;
1684}
1685
1686maprect *
1687maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1688{
1689 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1690 buf.clear ();
1691
1692 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1693
1694 // add end marker
1695 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1696 r->m = 0;
1697
1698 return (maprect *)buf.linearise ();
1699}
1700

Diff Legend

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