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.110 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.150 by root, Thu Dec 4 03:48:19 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
27#include "funcpoint.h"
28
29#include "loader.h" 27#include "loader.h"
30
31#include "path.h" 28#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 assign (buf, create_pathname (name));
73 else
74 assign (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 29
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 30/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 31 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 32 * it will also do map translation for tiled maps, returning
102 * new values into newmap, nx, and ny. Any and all of those 33 * new values into newmap, nx, and ny. Any and all of those
… …
232 } 163 }
233 return 0; 164 return 0;
234} 165}
235 166
236/* 167/*
237 * Returns true if the given object can't fit in the given spot. 168 * Returns qthe blocking object if the given object can't fit in the given
238 * This is meant for multi space objects - for single space objecs, 169 * spot. This is meant for multi space objects - for single space objecs,
239 * just calling get_map_blocked and checking that against movement type 170 * just calling get_map_blocked and checking that against movement type
240 * of object. This function goes through all the parts of the 171 * of object. This function goes through all the parts of the multipart
241 * multipart object and makes sure they can be inserted. 172 * object and makes sure they can be inserted.
242 * 173 *
243 * While this doesn't call out of map, the get_map_flags does. 174 * While this doesn't call out of map, the get_map_flags does.
244 * 175 *
245 * This function has been used to deprecate arch_out_of_map - 176 * This function has been used to deprecate arch_out_of_map -
246 * this function also does that check, and since in most cases, 177 * this function also does that check, and since in most cases,
… …
257 * 188 *
258 * Note this used to be arch_blocked, but with new movement 189 * Note this used to be arch_blocked, but with new movement
259 * code, we need to have actual object to check its move_type 190 * code, we need to have actual object to check its move_type
260 * against the move_block values. 191 * against the move_block values.
261 */ 192 */
262int 193bool
263ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 194object::blocked (maptile *m, int x, int y) const
264{ 195{
265 archetype *tmp; 196 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
266 int flag;
267 maptile *m1;
268 sint16 sx, sy;
269
270 if (!ob)
271 {
272 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
273 if (flag & P_OUT_OF_MAP)
274 return P_OUT_OF_MAP;
275
276 /* don't have object, so don't know what types would block */
277 return m1->at (sx, sy).move_block;
278 } 197 {
198 mapxy pos (m, x + tmp->x, y + tmp->y);
279 199
280 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 200 if (!pos.normalise ())
281 { 201 return 1;
282 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
283 202
284 if (flag & P_OUT_OF_MAP) 203 mapspace &ms = *pos;
285 return P_OUT_OF_MAP; 204
286 if (flag & P_IS_ALIVE) 205 if (ms.flags () & P_IS_ALIVE)
287 return P_IS_ALIVE; 206 return 1;
288 207
289 mapspace &ms = m1->at (sx, sy); 208 /* However, often ob doesn't have any move type
290 209 * (signifying non-moving objects)
291 /* find_first_free_spot() calls this function. However, often
292 * ob doesn't have any move type (when used to place exits)
293 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 210 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
294 */ 211 */
295
296 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 212 if (!move_type && ms.move_block != MOVE_ALL)
297 continue; 213 continue;
298 214
299 /* Note it is intentional that we check ob - the movement type of the 215 /* Note it is intentional that we check ob - the movement type of the
300 * head of the object should correspond for the entire object. 216 * head of the object should correspond for the entire object.
301 */ 217 */
302 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 218 if (ms.blocks (move_type))
303 return P_NO_PASS; 219 return 1;
304 } 220 }
305 221
306 return 0; 222 return 0;
307} 223}
308 224
… …
326 242
327 insert_ob_in_ob (tmp, container); 243 insert_ob_in_ob (tmp, container);
328 tmp = next; 244 tmp = next;
329 } 245 }
330 246
331 /* sum_weight will go through and calculate what all the containers are 247 // go through and calculate what all the containers are carrying.
332 * carrying. 248 //TODO: remove
333 */ 249 container->update_weight ();
334 sum_weight (container);
335} 250}
336 251
337void 252void
338maptile::set_object_flag (int flag, int value) 253maptile::set_object_flag (int flag, int value)
339{ 254{
… …
341 return; 256 return;
342 257
343 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 258 for (mapspace *ms = spaces + size (); ms-- > spaces; )
344 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 259 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
345 tmp->flag [flag] = value; 260 tmp->flag [flag] = value;
261}
262
263void
264maptile::post_load_original ()
265{
266 if (!spaces)
267 return;
268
269 set_object_flag (FLAG_OBJ_ORIGINAL);
270
271 for (mapspace *ms = spaces + size (); ms-- > spaces; )
272 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
273 INVOKE_OBJECT (RESET, tmp);
346} 274}
347 275
348/* link_multipart_objects go through all the objects on the map looking 276/* link_multipart_objects go through all the objects on the map looking
349 * for objects whose arch says they are multipart yet according to the 277 * for objects whose arch says they are multipart yet according to the
350 * info we have, they only have the head (as would be expected when 278 * info we have, they only have the head (as would be expected when
… …
355{ 283{
356 if (!spaces) 284 if (!spaces)
357 return; 285 return;
358 286
359 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 287 for (mapspace *ms = spaces + size (); ms-- > spaces; )
360 for (object *op = ms->bot; op; op = op->above) 288 {
289 object *op = ms->bot;
290 while (op)
361 { 291 {
362 /* already multipart - don't do anything more */ 292 /* already multipart - don't do anything more */
363 if (op->head_ () == op && !op->more && op->arch->more) 293 if (op->head_ () == op && !op->more && op->arch->more)
364 { 294 {
365 op->remove (); 295 op->remove ();
366 op->expand_tail (); 296 op->expand_tail ();
297
298 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
299 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
300 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
367 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 301 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
302
303 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
304 // so we have to reset the iteration through the mapspace
368 } 305 }
306 else
307 op = op->above;
369 } 308 }
309 }
370} 310}
371 311
372/* 312/*
373 * Loads (ands parses) the objects into a given map from the specified 313 * Loads (ands parses) the objects into a given map from the specified
374 * file pointer. 314 * file pointer.
… …
376bool 316bool
377maptile::_load_objects (object_thawer &f) 317maptile::_load_objects (object_thawer &f)
378{ 318{
379 for (;;) 319 for (;;)
380 { 320 {
381 coroapi::cede_to_tick_every (100); // cede once in a while 321 coroapi::cede_to_tick (); // cede once in a while
382 322
383 switch (f.kw) 323 switch (f.kw)
384 { 324 {
385 case KW_arch: 325 case KW_arch:
386 if (object *op = object::read (f, this)) 326 if (object *op = object::read (f, this))
387 { 327 {
328 // TODO: why?
388 if (op->inv) 329 if (op->inv)
389 sum_weight (op); 330 op->update_weight ();
390 331
391 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 332 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
333 {
334 // we insert manually because
335 // a) its way faster
336 // b) we remove manually, too, and there are good reasons for that
337 // c) its correct
338 mapspace &ms = at (op->x, op->y);
339
340 op->flag [FLAG_REMOVED] = false;
341
342 op->above = 0;
343 op->below = ms.top;
344
345 if (ms.top)
346 ms.top->above = op;
347 else
348 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 }
392 } 358 }
393 359
394 continue; 360 continue;
395 361
396 case KW_EOF: 362 case KW_EOF:
… …
409} 375}
410 376
411void 377void
412maptile::activate () 378maptile::activate ()
413{ 379{
414 active = true;
415
416 if (spaces) 380 if (spaces)
417 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 381 for (mapspace *ms = spaces + size (); ms-- > spaces; )
418 for (object *op = ms->bot; op; op = op->above) 382 for (object *op = ms->bot; op; op = op->above)
419 op->activate_recursive (); 383 op->activate_recursive ();
420} 384}
421 385
422void 386void
423maptile::deactivate () 387maptile::deactivate ()
424{ 388{
425 active = false;
426
427 if (spaces) 389 if (spaces)
428 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 390 for (mapspace *ms = spaces + size (); ms-- > spaces; )
429 for (object *op = ms->bot; op; op = op->above) 391 for (object *op = ms->bot; op; op = op->above)
430 op->deactivate_recursive (); 392 op->deactivate_recursive ();
431} 393}
… …
441 if (!spaces) 403 if (!spaces)
442 return false; 404 return false;
443 405
444 for (int i = 0; i < size (); ++i) 406 for (int i = 0; i < size (); ++i)
445 { 407 {
446 int unique = 0; 408 bool unique = 0;
409
447 for (object *op = spaces [i].bot; op; op = op->above) 410 for (object *op = spaces [i].bot; op; op = op->above)
448 { 411 {
449 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 412 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
450 unique = 1;
451 413
452 if (!op->can_map_save ()) 414 if (expect_false (!op->can_map_save ()))
453 continue; 415 continue;
454 416
455 if (unique || op->flag [FLAG_UNIQUE]) 417 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
456 { 418 {
457 if (flags & IO_UNIQUES) 419 if (flags & IO_UNIQUES)
458 op->write (f); 420 op->write (f);
459 } 421 }
460 else if (flags & IO_OBJECTS) 422 else if (expect_true (flags & IO_OBJECTS))
461 op->write (f); 423 op->write (f);
462 } 424 }
463 } 425 }
464 426
465 coroapi::cede_to_tick (); 427 coroapi::cede_to_tick ();
466 428
467 return true; 429 return true;
468}
469
470bool
471maptile::_load_objects (const char *path, bool skip_header)
472{
473 object_thawer f (path);
474
475 if (!f)
476 return false;
477
478 f.next ();
479
480 if (skip_header)
481 for (;;)
482 {
483 keyword kw = f.kw;
484 f.skip ();
485 if (kw == KW_end)
486 break;
487 }
488
489 return _load_objects (f);
490} 430}
491 431
492bool 432bool
493maptile::_save_objects (const char *path, int flags) 433maptile::_save_objects (const char *path, int flags)
494{ 434{
… …
669bool 609bool
670maptile::_load_header (object_thawer &thawer) 610maptile::_load_header (object_thawer &thawer)
671{ 611{
672 for (;;) 612 for (;;)
673 { 613 {
674 thawer.next ();
675
676 switch (thawer.kw) 614 switch (thawer.kw)
677 { 615 {
678 case KW_msg: 616 case KW_msg:
679 thawer.get_ml (KW_endmsg, msg); 617 thawer.get_ml (KW_endmsg, msg);
680 break; 618 break;
… …
714 case KW_sky: thawer.get (sky); break; 652 case KW_sky: thawer.get (sky); break;
715 653
716 case KW_per_player: thawer.get (per_player); break; 654 case KW_per_player: thawer.get (per_player); break;
717 case KW_per_party: thawer.get (per_party); break; 655 case KW_per_party: thawer.get (per_party); break;
718 case KW_no_reset: thawer.get (no_reset); break; 656 case KW_no_reset: thawer.get (no_reset); break;
657 case KW_no_drop: thawer.get (no_drop); break;
719 658
720 case KW_region: default_region = region::find (thawer.get_str ()); break; 659 case KW_region: default_region = region::find (thawer.get_str ()); break;
721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 660 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
722 661
723 // old names new names 662 // old names new names
… …
734 case KW_tile_path_1: thawer.get (tile_path [0]); break; 673 case KW_tile_path_1: thawer.get (tile_path [0]); break;
735 case KW_tile_path_2: thawer.get (tile_path [1]); break; 674 case KW_tile_path_2: thawer.get (tile_path [1]); break;
736 case KW_tile_path_3: thawer.get (tile_path [2]); break; 675 case KW_tile_path_3: thawer.get (tile_path [2]); break;
737 case KW_tile_path_4: thawer.get (tile_path [3]); break; 676 case KW_tile_path_4: thawer.get (tile_path [3]); break;
738 677
678 case KW_ERROR:
679 set_key_text (thawer.kw_str, thawer.value);
680 break;
681
739 case KW_end: 682 case KW_end:
683 thawer.next ();
740 return true; 684 return true;
741 685
742 default: 686 default:
743 if (!thawer.parse_error ("map", 0)) 687 if (!thawer.parse_error ("map", 0))
744 return false; 688 return false;
745 break; 689 break;
746 } 690 }
691
692 thawer.next ();
747 } 693 }
748 694
749 abort (); 695 abort ();
750}
751
752bool
753maptile::_load_header (const char *path)
754{
755 object_thawer thawer (path);
756
757 if (!thawer)
758 return false;
759
760 return _load_header (thawer);
761} 696}
762 697
763/****************************************************************************** 698/******************************************************************************
764 * This is the start of unique map handling code 699 * This is the start of unique map handling code
765 *****************************************************************************/ 700 *****************************************************************************/
… …
777 712
778 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))
779 unique = 1; 714 unique = 1;
780 715
781 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 716 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
782 {
783 op->destroy_inv (false);
784 op->destroy (); 717 op->destroy ();
785 }
786 718
787 op = above; 719 op = above;
788 } 720 }
789 } 721 }
790} 722}
… …
801 MAP_OUT (swap_time); 733 MAP_OUT (swap_time);
802 MAP_OUT (reset_time); 734 MAP_OUT (reset_time);
803 MAP_OUT (reset_timeout); 735 MAP_OUT (reset_timeout);
804 MAP_OUT (fixed_resettime); 736 MAP_OUT (fixed_resettime);
805 MAP_OUT (no_reset); 737 MAP_OUT (no_reset);
738 MAP_OUT (no_drop);
806 MAP_OUT (difficulty); 739 MAP_OUT (difficulty);
807 740
808 if (default_region) MAP_OUT2 (region, default_region->name); 741 if (default_region) MAP_OUT2 (region, default_region->name);
809 742
810 if (shopitems) 743 if (shopitems)
… …
864 * Remove and free all objects in the given map. 797 * Remove and free all objects in the given map.
865 */ 798 */
866void 799void
867maptile::clear () 800maptile::clear ()
868{ 801{
869 sfree (regions, size ()), regions = 0;
870 free (regionmap), regionmap = 0;
871
872 if (spaces) 802 if (spaces)
873 { 803 {
874 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 804 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 while (object *op = ms->bot) 805 while (object *op = ms->bot)
876 { 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
877 op = op->head_ (); 813 object *head = op->head_ ();
878 op->destroy_inv (false); 814 if (op == head)
879 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 }
880 } 821 }
881 822
882 sfree (spaces, size ()), spaces = 0; 823 sfree0 (spaces, size ());
883 } 824 }
884 825
885 if (buttons) 826 if (buttons)
886 free_objectlinkpt (buttons), buttons = 0; 827 free_objectlinkpt (buttons), buttons = 0;
828
829 sfree0 (regions, size ());
830 delete [] regionmap; regionmap = 0;
887} 831}
888 832
889void 833void
890maptile::clear_header () 834maptile::clear_header ()
891{ 835{
… …
943 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 887 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
944 break; 888 break;
945 889
946 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 890 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
947 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 891 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
948 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
949 || QUERY_FLAG (op, FLAG_UNIQUE) 892 || QUERY_FLAG (op, FLAG_UNIQUE)
950 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 893 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
951 || QUERY_FLAG (op, FLAG_UNPAID) 894 || QUERY_FLAG (op, FLAG_UNPAID)
952 || op->is_alive ()) 895 || op->is_alive ())
953 ; // do not decay 896 ; // do not decay
… …
1045 988
1046 if (QUERY_FLAG (op, FLAG_GENERATOR)) 989 if (QUERY_FLAG (op, FLAG_GENERATOR))
1047 { 990 {
1048 total_exp += op->stats.exp; 991 total_exp += op->stats.exp;
1049 992
1050 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 993 if (archetype *at = op->other_arch)
994 {
1051 total_exp += at->stats.exp * 8; 995 total_exp += at->stats.exp * 8;
1052
1053 monster_cnt++; 996 monster_cnt++;
997 }
998
999 for (object *inv = op->inv; inv; inv = inv->below)
1000 {
1001 total_exp += op->stats.exp * 8;
1002 monster_cnt++;
1003 }
1054 } 1004 }
1055 } 1005 }
1056 1006
1057 avgexp = (double) total_exp / monster_cnt; 1007 avgexp = (double) total_exp / monster_cnt;
1058 1008
… …
1097 else 1047 else
1098 darkness = new_level; 1048 darkness = new_level;
1099 1049
1100 /* All clients need to get re-updated for the change */ 1050 /* All clients need to get re-updated for the change */
1101 update_all_map_los (this); 1051 update_all_map_los (this);
1052
1102 return 1; 1053 return 1;
1103} 1054}
1104 1055
1105/* 1056/*
1106 * This function updates various attributes about a specific space 1057 * This function updates various attributes about a specific space
… …
1109 * through, etc) 1060 * through, etc)
1110 */ 1061 */
1111void 1062void
1112mapspace::update_ () 1063mapspace::update_ ()
1113{ 1064{
1114 object *tmp, *last = 0; 1065 object *last = 0;
1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1066 uint8 flags = P_UPTODATE, anywhere = 0;
1067 sint8 light = 0;
1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1068 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1069
1118 //object *middle = 0; 1070 //object *middle = 0;
1119 //object *top = 0; 1071 //object *top = 0;
1120 //object *floor = 0; 1072 //object *floor = 0;
1121 // this seems to generate better code than using locals, above 1073 // this seems to generate better code than using locals, above
1122 object *&top = faces_obj[0] = 0; 1074 object *&top = faces_obj[0] = 0;
1123 object *&middle = faces_obj[1] = 0; 1075 object *&middle = faces_obj[1] = 0;
1124 object *&floor = faces_obj[2] = 0; 1076 object *&floor = faces_obj[2] = 0;
1125 1077
1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1078 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1127 { 1079 {
1128 /* This could be made additive I guess (two lights better than 1080 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1129 * one). But if so, it shouldn't be a simple additive - 2
1130 * light bulbs do not illuminate twice as far as once since
1131 * it is a dissapation factor that is cubed.
1132 */
1133 if (tmp->glow_radius > light)
1134 light = tmp->glow_radius; 1081 light += tmp->glow_radius;
1135 1082
1136 /* This call is needed in order to update objects the player 1083 /* This call is needed in order to update objects the player
1137 * is standing in that have animations (ie, grass, fire, etc). 1084 * is standing in that have animations (ie, grass, fire, etc).
1138 * However, it also causes the look window to be re-drawn 1085 * However, it also causes the look window to be re-drawn
1139 * 3 times each time the player moves, because many of the 1086 * 3 times each time the player moves, because many of the
… …
1158 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1105 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1159 { 1106 {
1160 middle = tmp; 1107 middle = tmp;
1161 anywhere = 1; 1108 anywhere = 1;
1162 } 1109 }
1110
1163 /* Find the highest visible face around. If equal 1111 /* Find the highest visible face around. If equal
1164 * visibilities, we still want the one nearer to the 1112 * visibilities, we still want the one nearer to the
1165 * top 1113 * top
1166 */ 1114 */
1167 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1115 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1186 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1134 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1187 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1135 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1188 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1136 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1189 } 1137 }
1190 1138
1191 this->light = light; 1139 this->light = min (light, MAX_LIGHT_RADIUS);
1192 this->flags_ = flags; 1140 this->flags_ = flags;
1193 this->move_block = move_block & ~move_allow; 1141 this->move_block = move_block & ~move_allow;
1194 this->move_on = move_on; 1142 this->move_on = move_on;
1195 this->move_off = move_off; 1143 this->move_off = move_off;
1196 this->move_slow = move_slow; 1144 this->move_slow = move_slow;
… …
1216 * 1) top face is set, need middle to be set. 1164 * 1) top face is set, need middle to be set.
1217 * 2) middle is set, need to set top. 1165 * 2) middle is set, need to set top.
1218 * 3) neither middle or top is set - need to set both. 1166 * 3) neither middle or top is set - need to set both.
1219 */ 1167 */
1220 1168
1221 for (tmp = last; tmp; tmp = tmp->below) 1169 for (object *tmp = last; tmp; tmp = tmp->below)
1222 { 1170 {
1223 /* Once we get to a floor, stop, since we already have a floor object */ 1171 /* Once we get to a floor, stop, since we already have a floor object */
1224 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1172 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1225 break; 1173 break;
1226 1174
… …
1278 vol += op->volume (); 1226 vol += op->volume ();
1279 1227
1280 return vol; 1228 return vol;
1281} 1229}
1282 1230
1283/* this updates the orig_map->tile_map[tile_num] value after finding 1231bool
1284 * the map. It also takes care of linking back the freshly found 1232maptile::tile_available (int dir, bool load)
1285 * maps tile_map values if it tiles back to this one. It returns
1286 * the value of orig_map->tile_map[tile_num].
1287 */
1288static inline maptile *
1289find_and_link (maptile *orig_map, int tile_num)
1290{ 1233{
1291 maptile *mp = orig_map->tile_map [tile_num]; 1234 if (!tile_path[dir])
1235 return 0;
1292 1236
1293 if (!mp) 1237 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1294 { 1238 return 1;
1295 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1296 1239
1297 if (!mp) 1240 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1298 { 1241 return 1;
1299 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1300 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1301 &orig_map->tile_path[tile_num], &orig_map->path);
1302 mp = new maptile (1, 1);
1303 mp->alloc ();
1304 mp->in_memory = MAP_IN_MEMORY;
1305 }
1306 }
1307 1242
1308 int dest_tile = (tile_num + 2) % 4;
1309
1310 orig_map->tile_map [tile_num] = mp;
1311
1312 // optimisation: back-link map to origin map if euclidean
1313 //TODO: non-euclidean maps MUST GO
1314 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1315 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1316
1317 return mp; 1243 return 0;
1318}
1319
1320static inline void
1321load_and_link (maptile *orig_map, int tile_num)
1322{
1323 find_and_link (orig_map, tile_num)->load_sync ();
1324} 1244}
1325 1245
1326/* this returns TRUE if the coordinates (x,y) are out of 1246/* this returns TRUE if the coordinates (x,y) are out of
1327 * map m. This function also takes into account any 1247 * map m. This function also takes into account any
1328 * tiling considerations, loading adjacant maps as needed. 1248 * tiling considerations, loading adjacant maps as needed.
… …
1341 if (!m) 1261 if (!m)
1342 return 0; 1262 return 0;
1343 1263
1344 if (x < 0) 1264 if (x < 0)
1345 { 1265 {
1346 if (!m->tile_path[3]) 1266 if (!m->tile_available (3))
1347 return 1; 1267 return 1;
1348 1268
1349 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1350 find_and_link (m, 3);
1351
1352 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1269 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1353 } 1270 }
1354 1271
1355 if (x >= m->width) 1272 if (x >= m->width)
1356 { 1273 {
1357 if (!m->tile_path[1]) 1274 if (!m->tile_available (1))
1358 return 1; 1275 return 1;
1359 1276
1360 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1361 find_and_link (m, 1);
1362
1363 return out_of_map (m->tile_map[1], x - m->width, y); 1277 return out_of_map (m->tile_map[1], x - m->width, y);
1364 } 1278 }
1365 1279
1366 if (y < 0) 1280 if (y < 0)
1367 { 1281 {
1368 if (!m->tile_path[0]) 1282 if (!m->tile_available (0))
1369 return 1; 1283 return 1;
1370 1284
1371 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1372 find_and_link (m, 0);
1373
1374 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1285 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1375 } 1286 }
1376 1287
1377 if (y >= m->height) 1288 if (y >= m->height)
1378 { 1289 {
1379 if (!m->tile_path[2]) 1290 if (!m->tile_available (2))
1380 return 1; 1291 return 1;
1381
1382 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1383 find_and_link (m, 2);
1384 1292
1385 return out_of_map (m->tile_map[2], x, y - m->height); 1293 return out_of_map (m->tile_map[2], x, y - m->height);
1386 } 1294 }
1387 1295
1388 /* Simple case - coordinates are within this local 1296 /* Simple case - coordinates are within this local
… …
1402maptile * 1310maptile *
1403maptile::xy_find (sint16 &x, sint16 &y) 1311maptile::xy_find (sint16 &x, sint16 &y)
1404{ 1312{
1405 if (x < 0) 1313 if (x < 0)
1406 { 1314 {
1407 if (!tile_path[3]) 1315 if (!tile_available (3))
1408 return 0; 1316 return 0;
1409 1317
1410 find_and_link (this, 3);
1411 x += tile_map[3]->width; 1318 x += tile_map[3]->width;
1412 return tile_map[3]->xy_find (x, y); 1319 return tile_map[3]->xy_find (x, y);
1413 } 1320 }
1414 1321
1415 if (x >= width) 1322 if (x >= width)
1416 { 1323 {
1417 if (!tile_path[1]) 1324 if (!tile_available (1))
1418 return 0; 1325 return 0;
1419 1326
1420 find_and_link (this, 1);
1421 x -= width; 1327 x -= width;
1422 return tile_map[1]->xy_find (x, y); 1328 return tile_map[1]->xy_find (x, y);
1423 } 1329 }
1424 1330
1425 if (y < 0) 1331 if (y < 0)
1426 { 1332 {
1427 if (!tile_path[0]) 1333 if (!tile_available (0))
1428 return 0; 1334 return 0;
1429 1335
1430 find_and_link (this, 0);
1431 y += tile_map[0]->height; 1336 y += tile_map[0]->height;
1432 return tile_map[0]->xy_find (x, y); 1337 return tile_map[0]->xy_find (x, y);
1433 } 1338 }
1434 1339
1435 if (y >= height) 1340 if (y >= height)
1436 { 1341 {
1437 if (!tile_path[2]) 1342 if (!tile_available (2))
1438 return 0; 1343 return 0;
1439 1344
1440 find_and_link (this, 2);
1441 y -= height; 1345 y -= height;
1442 return tile_map[2]->xy_find (x, y); 1346 return tile_map[2]->xy_find (x, y);
1443 } 1347 }
1444 1348
1445 /* Simple case - coordinates are within this local 1349 /* Simple case - coordinates are within this local
… …
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1360adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1361{
1458 if (!map1 || !map2) 1362 if (!map1 || !map2)
1459 return 0; 1363 return 0;
1460 1364
1461 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1365 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1462 //fix: compare paths instead (this is likely faster, too!) 1366 //fix: compare paths instead (this is likely faster, too!)
1463 if (map1 == map2) 1367 if (map1 == map2)
1464 { 1368 {
1465 *dx = 0; 1369 *dx = 0;
1466 *dy = 0; 1370 *dy = 0;
… …
1673} 1577}
1674 1578
1675object * 1579object *
1676maptile::insert (object *op, int x, int y, object *originator, int flags) 1580maptile::insert (object *op, int x, int y, object *originator, int flags)
1677{ 1581{
1678 if (!op->flag [FLAG_REMOVED])
1679 op->remove ();
1680
1681 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1582 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1682} 1583}
1683 1584
1684region * 1585region *
1685maptile::region (int x, int y) const 1586maptile::region (int x, int y) const
… …
1695 1596
1696 return ::region::default_region (); 1597 return ::region::default_region ();
1697} 1598}
1698 1599
1699/* picks a random object from a style map. 1600/* picks a random object from a style map.
1700 * Redone by MSW so it should be faster and not use static
1701 * variables to generate tables.
1702 */ 1601 */
1703object * 1602object *
1704maptile::pick_random_object () const 1603maptile::pick_random_object (rand_gen &gen) const
1705{ 1604{
1706 /* while returning a null object will result in a crash, that 1605 /* while returning a null object will result in a crash, that
1707 * is actually preferable to an infinite loop. That is because 1606 * is actually preferable to an infinite loop. That is because
1708 * most servers will automatically restart in case of crash. 1607 * most servers will automatically restart in case of crash.
1709 * Change the logic on getting the random space - shouldn't make 1608 * Change the logic on getting the random space - shouldn't make
1710 * any difference, but this seems clearer to me. 1609 * any difference, but this seems clearer to me.
1711 */ 1610 */
1712 for (int i = 1000; --i;) 1611 for (int i = 1000; --i;)
1713 { 1612 {
1714 object *pick = at (rndm (width), rndm (height)).bot; 1613 object *pick = at (gen (width), gen (height)).bot;
1715 1614
1716 // do not prefer big monsters just because they are big. 1615 // do not prefer big monsters just because they are big.
1717 if (pick && pick->head_ () == pick) 1616 if (pick && pick->is_head ())
1718 return pick->head_ (); 1617 return pick->head_ ();
1719 } 1618 }
1720 1619
1721 // instead of crashing in the unlikely(?) case, try to return *something* 1620 // instead of crashing in the unlikely(?) case, try to return *something*
1722 return get_archetype ("blocked"); 1621 return archetype::find ("bug");
1723} 1622}
1724 1623
1624void
1625maptile::play_sound (faceidx sound, int x, int y) const
1626{
1627 if (!sound)
1628 return;
1629
1630 for_all_players (pl)
1631 if (pl->ob->map == this)
1632 if (client *ns = pl->ns)
1633 {
1634 int dx = x - pl->ob->x;
1635 int dy = y - pl->ob->y;
1636
1637 int distance = idistance (dx, dy);
1638
1639 if (distance <= MAX_SOUND_DISTANCE)
1640 ns->play_sound (sound, dx, dy);
1641 }
1642}
1643

Diff Legend

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