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.102 by root, Thu May 17 21:32:08 2007 UTC vs.
Revision 1.143 by root, Sun May 18 19:53:07 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <unistd.h> 24#include <unistd.h>
26 25
27#include "global.h" 26#include "global.h"
28#include "funcpoint.h"
29 27
30#include "loader.h" 28#include "loader.h"
31 29
32#include "path.h" 30#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 31
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 32/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 33 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 34 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 35 * new values into newmap, nx, and ny. Any and all of those
… …
220 * hidden dm 152 * hidden dm
221 */ 153 */
222 if (OB_MOVE_BLOCK (ob, tmp)) 154 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1; 155 return 1;
224 156
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) 157 if (tmp->flag [FLAG_ALIVE]
226 && tmp->head_ () != ob 158 && tmp->head_ () != ob
227 && tmp != ob 159 && tmp != ob
228 && tmp->type != DOOR 160 && tmp->type != DOOR
229 && !tmp->flag [FLAG_WIZ] 161 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
230 && tmp->contr->hidden)
231 return 1; 162 return 1;
232 } 163 }
233 164
234 } 165 }
235 return 0; 166 return 0;
236} 167}
237 168
238/* 169/*
239 * Returns true if the given object can't fit in the given spot. 170 * Returns qthe blocking object if the given object can't fit in the given
240 * This is meant for multi space objects - for single space objecs, 171 * spot. This is meant for multi space objects - for single space objecs,
241 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
242 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
243 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
244 * 175 *
245 * While this doesn't call out of map, the get_map_flags does. 176 * While this doesn't call out of map, the get_map_flags does.
246 * 177 *
247 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
248 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
259 * 190 *
260 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
261 * code, we need to have actual object to check its move_type 192 * code, we need to have actual object to check its move_type
262 * against the move_block values. 193 * against the move_block values.
263 */ 194 */
264int 195bool
265ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
266{ 197{
267 archetype *tmp; 198 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
268 int flag;
269 maptile *m1;
270 sint16 sx, sy;
271
272 if (!ob)
273 {
274 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
275 if (flag & P_OUT_OF_MAP)
276 return P_OUT_OF_MAP;
277
278 /* don't have object, so don't know what types would block */
279 return m1->at (sx, sy).move_block;
280 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
281 201
282 for (tmp = ob->arch; tmp; tmp = tmp->more) 202 if (!pos.normalise ())
283 { 203 return 1;
284 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
285 204
286 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
287 return P_OUT_OF_MAP; 206
288 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
289 return P_IS_ALIVE; 208 return 1;
290 209
291 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
292 211 * (signifying non-moving objects)
293 /* find_first_free_spot() calls this function. However, often
294 * ob doesn't have any move type (when used to place exits)
295 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 212 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
296 */ 213 */
297
298 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
299 continue; 215 continue;
300 216
301 /* Note it is intentional that we check ob - the movement type of the 217 /* Note it is intentional that we check ob - the movement type of the
302 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
303 */ 219 */
304 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
305 return P_NO_PASS; 221 return 1;
306 } 222 }
307 223
308 return 0; 224 return 0;
309} 225}
310 226
… …
328 244
329 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
330 tmp = next; 246 tmp = next;
331 } 247 }
332 248
333 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
334 * carrying. 250 //TODO: remove
335 */ 251 container->update_weight ();
336 sum_weight (container);
337} 252}
338 253
339void 254void
340maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
341{ 256{
… …
357{ 272{
358 if (!spaces) 273 if (!spaces)
359 return; 274 return;
360 275
361 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 276 for (mapspace *ms = spaces + size (); ms-- > spaces; )
362 for (object *op = ms->bot; op; op = op->above) 277 {
278 object *op = ms->bot;
279 while (op)
363 { 280 {
364 /* already multipart - don't do anything more */ 281 /* already multipart - don't do anything more */
365 if (op->head_ () == op && !op->more && op->arch->more) 282 if (op->head_ () == op && !op->more && op->arch->more)
366 { 283 {
367 op->remove (); 284 op->remove ();
368 op->expand_tail (); 285 op->expand_tail ();
286
287 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
288 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
289 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
369 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 290 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
291
292 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
293 // so we have to reset the iteration through the mapspace
370 } 294 }
295 else
296 op = op->above;
371 } 297 }
298 }
372} 299}
373 300
374/* 301/*
375 * Loads (ands parses) the objects into a given map from the specified 302 * Loads (ands parses) the objects into a given map from the specified
376 * file pointer. 303 * file pointer.
… …
378bool 305bool
379maptile::_load_objects (object_thawer &f) 306maptile::_load_objects (object_thawer &f)
380{ 307{
381 for (;;) 308 for (;;)
382 { 309 {
383 coroapi::cede_to_tick_every (100); // cede once in a while 310 coroapi::cede_to_tick (); // cede once in a while
384 311
385 switch (f.kw) 312 switch (f.kw)
386 { 313 {
387 case KW_arch: 314 case KW_arch:
388 if (object *op = object::read (f, this)) 315 if (object *op = object::read (f, this))
389 { 316 {
317 // TODO: why?
390 if (op->inv) 318 if (op->inv)
391 sum_weight (op); 319 op->update_weight ();
392 320
393 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
322 {
323 // we insert manually because
324 // a) its way faster
325 // b) we remove manually, too, and there are good reasons for that
326 // c) its correct
327 mapspace &ms = at (op->x, op->y);
328
329 op->flag [FLAG_REMOVED] = false;
330
331 op->above = 0;
332 op->below = ms.top;
333
334 if (ms.top)
335 ms.top->above = op;
336 else
337 ms.bot = op;
338
339 ms.top = op;
340 ms.flags_ = 0;
341 }
342 else
343 {
344 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
345 op->destroy ();
346 }
394 } 347 }
395 348
396 continue; 349 continue;
397 350
398 case KW_EOF: 351 case KW_EOF:
… …
411} 364}
412 365
413void 366void
414maptile::activate () 367maptile::activate ()
415{ 368{
416 active = true;
417
418 if (spaces) 369 if (spaces)
419 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
420 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
421 op->activate_recursive (); 372 op->activate_recursive ();
422} 373}
423 374
424void 375void
425maptile::deactivate () 376maptile::deactivate ()
426{ 377{
427 active = false;
428
429 if (spaces) 378 if (spaces)
430 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 379 for (mapspace *ms = spaces + size (); ms-- > spaces; )
431 for (object *op = ms->bot; op; op = op->above) 380 for (object *op = ms->bot; op; op = op->above)
432 op->deactivate_recursive (); 381 op->deactivate_recursive ();
433} 382}
… …
443 if (!spaces) 392 if (!spaces)
444 return false; 393 return false;
445 394
446 for (int i = 0; i < size (); ++i) 395 for (int i = 0; i < size (); ++i)
447 { 396 {
448 int unique = 0; 397 bool unique = 0;
398
449 for (object *op = spaces [i].bot; op; op = op->above) 399 for (object *op = spaces [i].bot; op; op = op->above)
450 { 400 {
451 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 401 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
452 unique = 1;
453 402
454 if (!op->can_map_save ()) 403 if (expect_false (!op->can_map_save ()))
455 continue; 404 continue;
456 405
457 if (unique || op->flag [FLAG_UNIQUE]) 406 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
458 { 407 {
459 if (flags & IO_UNIQUES) 408 if (flags & IO_UNIQUES)
460 op->write (f); 409 op->write (f);
461 } 410 }
462 else if (flags & IO_OBJECTS) 411 else if (expect_true (flags & IO_OBJECTS))
463 op->write (f); 412 op->write (f);
464 } 413 }
465 } 414 }
466 415
467 coroapi::cede_to_tick (); 416 coroapi::cede_to_tick ();
468 417
469 return true; 418 return true;
470}
471
472bool
473maptile::_load_objects (const char *path, bool skip_header)
474{
475 object_thawer f (path);
476
477 if (!f)
478 return false;
479
480 f.next ();
481
482 if (skip_header)
483 for (;;)
484 {
485 keyword kw = f.kw;
486 f.skip ();
487 if (kw == KW_end)
488 break;
489 }
490
491 return _load_objects (f);
492} 419}
493 420
494bool 421bool
495maptile::_save_objects (const char *path, int flags) 422maptile::_save_objects (const char *path, int flags)
496{ 423{
… …
671bool 598bool
672maptile::_load_header (object_thawer &thawer) 599maptile::_load_header (object_thawer &thawer)
673{ 600{
674 for (;;) 601 for (;;)
675 { 602 {
676 keyword kw = thawer.get_kv ();
677
678 switch (kw) 603 switch (thawer.kw)
679 { 604 {
680 case KW_msg: 605 case KW_msg:
681 thawer.get_ml (KW_endmsg, msg); 606 thawer.get_ml (KW_endmsg, msg);
682 break; 607 break;
683 608
… …
715 case KW_winddir: thawer.get (winddir); break; 640 case KW_winddir: thawer.get (winddir); break;
716 case KW_sky: thawer.get (sky); break; 641 case KW_sky: thawer.get (sky); break;
717 642
718 case KW_per_player: thawer.get (per_player); break; 643 case KW_per_player: thawer.get (per_player); break;
719 case KW_per_party: thawer.get (per_party); break; 644 case KW_per_party: thawer.get (per_party); break;
645 case KW_no_reset: thawer.get (no_reset); break;
646 case KW_no_drop: thawer.get (no_drop); break;
720 647
721 case KW_region: default_region = region::find (thawer.get_str ()); break; 648 case KW_region: default_region = region::find (thawer.get_str ()); break;
722 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 649 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
723 650
724 // old names new names 651 // old names new names
… …
735 case KW_tile_path_1: thawer.get (tile_path [0]); break; 662 case KW_tile_path_1: thawer.get (tile_path [0]); break;
736 case KW_tile_path_2: thawer.get (tile_path [1]); break; 663 case KW_tile_path_2: thawer.get (tile_path [1]); break;
737 case KW_tile_path_3: thawer.get (tile_path [2]); break; 664 case KW_tile_path_3: thawer.get (tile_path [2]); break;
738 case KW_tile_path_4: thawer.get (tile_path [3]); break; 665 case KW_tile_path_4: thawer.get (tile_path [3]); break;
739 666
667 case KW_ERROR:
668 set_key_text (thawer.kw_str, thawer.value);
669 break;
670
740 case KW_end: 671 case KW_end:
672 thawer.next ();
741 return true; 673 return true;
742 674
743 default: 675 default:
744 if (!thawer.parse_error ("map", 0)) 676 if (!thawer.parse_error ("map", 0))
745 return false; 677 return false;
746 break; 678 break;
747 } 679 }
680
681 thawer.next ();
748 } 682 }
749 683
750 abort (); 684 abort ();
751}
752
753bool
754maptile::_load_header (const char *path)
755{
756 object_thawer thawer (path);
757
758 if (!thawer)
759 return false;
760
761 return _load_header (thawer);
762} 685}
763 686
764/****************************************************************************** 687/******************************************************************************
765 * This is the start of unique map handling code 688 * This is the start of unique map handling code
766 *****************************************************************************/ 689 *****************************************************************************/
… …
801 if (name) MAP_OUT (name); 724 if (name) MAP_OUT (name);
802 MAP_OUT (swap_time); 725 MAP_OUT (swap_time);
803 MAP_OUT (reset_time); 726 MAP_OUT (reset_time);
804 MAP_OUT (reset_timeout); 727 MAP_OUT (reset_timeout);
805 MAP_OUT (fixed_resettime); 728 MAP_OUT (fixed_resettime);
729 MAP_OUT (no_reset);
730 MAP_OUT (no_drop);
806 MAP_OUT (difficulty); 731 MAP_OUT (difficulty);
807 732
808 if (default_region) MAP_OUT2 (region, default_region->name); 733 if (default_region) MAP_OUT2 (region, default_region->name);
809 734
810 if (shopitems) 735 if (shopitems)
… …
864 * Remove and free all objects in the given map. 789 * Remove and free all objects in the given map.
865 */ 790 */
866void 791void
867maptile::clear () 792maptile::clear ()
868{ 793{
869 sfree (regions, size ()), regions = 0;
870 free (regionmap), regionmap = 0;
871
872 if (spaces) 794 if (spaces)
873 { 795 {
874 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 796 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 while (object *op = ms->bot->head_ ()) 797 while (object *op = ms->bot)
876 { 798 {
799 // manually remove, as to not trigger anything
800 if (ms->bot = op->above)
801 ms->bot->below = 0;
802
803 op->flag [FLAG_REMOVED] = true;
804
805 object *head = op->head_ ();
806 if (op == head)
807 {
877 op->destroy_inv (false); 808 op->destroy_inv (false);
878 op->destroy (); 809 op->destroy ();
810 }
811 else if (head->map != op->map)
812 {
813 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
814 head->destroy ();
815 }
879 } 816 }
880 817
881 sfree (spaces, size ()), spaces = 0; 818 sfree0 (spaces, size ());
882 } 819 }
883 820
884 if (buttons) 821 if (buttons)
885 free_objectlinkpt (buttons), buttons = 0; 822 free_objectlinkpt (buttons), buttons = 0;
823
824 sfree0 (regions, size ());
825 delete [] regionmap; regionmap = 0;
886} 826}
887 827
888void 828void
889maptile::clear_header () 829maptile::clear_header ()
890{ 830{
… …
920maptile::do_destroy () 860maptile::do_destroy ()
921{ 861{
922 attachable::do_destroy (); 862 attachable::do_destroy ();
923 863
924 clear (); 864 clear ();
865}
866
867/* decay and destroy perishable items in a map */
868void
869maptile::do_decay_objects ()
870{
871 if (!spaces)
872 return;
873
874 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 for (object *above, *op = ms->bot; op; op = above)
876 {
877 above = op->above;
878
879 bool destroy = 0;
880
881 // do not decay anything above unique floor tiles (yet :)
882 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
883 break;
884
885 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
886 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
887 || QUERY_FLAG (op, FLAG_UNIQUE)
888 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
889 || QUERY_FLAG (op, FLAG_UNPAID)
890 || op->is_alive ())
891 ; // do not decay
892 else if (op->is_weapon ())
893 {
894 op->stats.dam--;
895 if (op->stats.dam < 0)
896 destroy = 1;
897 }
898 else if (op->is_armor ())
899 {
900 op->stats.ac--;
901 if (op->stats.ac < 0)
902 destroy = 1;
903 }
904 else if (op->type == FOOD)
905 {
906 op->stats.food -= rndm (5, 20);
907 if (op->stats.food < 0)
908 destroy = 1;
909 }
910 else
911 {
912 int mat = op->materials;
913
914 if (mat & M_PAPER
915 || mat & M_LEATHER
916 || mat & M_WOOD
917 || mat & M_ORGANIC
918 || mat & M_CLOTH
919 || mat & M_LIQUID
920 || (mat & M_IRON && rndm (1, 5) == 1)
921 || (mat & M_GLASS && rndm (1, 2) == 1)
922 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
923 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
924 || (mat & M_ICE && temp > 32))
925 destroy = 1;
926 }
927
928 /* adjust overall chance below */
929 if (destroy && rndm (0, 1))
930 op->destroy ();
931 }
925} 932}
926 933
927/* 934/*
928 * Updates every button on the map (by calling update_button() for them). 935 * Updates every button on the map (by calling update_button() for them).
929 */ 936 */
… …
976 983
977 if (QUERY_FLAG (op, FLAG_GENERATOR)) 984 if (QUERY_FLAG (op, FLAG_GENERATOR))
978 { 985 {
979 total_exp += op->stats.exp; 986 total_exp += op->stats.exp;
980 987
981 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 988 if (archetype *at = op->other_arch)
989 {
982 total_exp += at->clone.stats.exp * 8; 990 total_exp += at->stats.exp * 8;
983
984 monster_cnt++; 991 monster_cnt++;
992 }
993
994 for (object *inv = op->inv; inv; inv = inv->below)
995 {
996 total_exp += op->stats.exp * 8;
997 monster_cnt++;
998 }
985 } 999 }
986 } 1000 }
987 1001
988 avgexp = (double) total_exp / monster_cnt; 1002 avgexp = (double) total_exp / monster_cnt;
989 1003
… …
1028 else 1042 else
1029 darkness = new_level; 1043 darkness = new_level;
1030 1044
1031 /* All clients need to get re-updated for the change */ 1045 /* All clients need to get re-updated for the change */
1032 update_all_map_los (this); 1046 update_all_map_los (this);
1047
1033 return 1; 1048 return 1;
1034} 1049}
1035 1050
1036/* 1051/*
1037 * This function updates various attributes about a specific space 1052 * This function updates various attributes about a specific space
… …
1040 * through, etc) 1055 * through, etc)
1041 */ 1056 */
1042void 1057void
1043mapspace::update_ () 1058mapspace::update_ ()
1044{ 1059{
1045 object *tmp, *last = 0; 1060 object *last = 0;
1046 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1061 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1047 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1062 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1048 1063
1049 //object *middle = 0; 1064 //object *middle = 0;
1050 //object *top = 0; 1065 //object *top = 0;
… …
1052 // this seems to generate better code than using locals, above 1067 // this seems to generate better code than using locals, above
1053 object *&top = faces_obj[0] = 0; 1068 object *&top = faces_obj[0] = 0;
1054 object *&middle = faces_obj[1] = 0; 1069 object *&middle = faces_obj[1] = 0;
1055 object *&floor = faces_obj[2] = 0; 1070 object *&floor = faces_obj[2] = 0;
1056 1071
1057 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1072 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1058 { 1073 {
1059 /* This could be made additive I guess (two lights better than 1074 /* This could be made additive I guess (two lights better than
1060 * one). But if so, it shouldn't be a simple additive - 2 1075 * one). But if so, it shouldn't be a simple additive - 2
1061 * light bulbs do not illuminate twice as far as once since 1076 * light bulbs do not illuminate twice as far as once since
1062 * it is a dissapation factor that is cubed. 1077 * it is a dissapation factor that is cubed.
1063 */ 1078 */
1064 if (tmp->glow_radius > light)
1065 light = tmp->glow_radius; 1079 light = max (light, tmp->glow_radius);
1066 1080
1067 /* This call is needed in order to update objects the player 1081 /* This call is needed in order to update objects the player
1068 * is standing in that have animations (ie, grass, fire, etc). 1082 * is standing in that have animations (ie, grass, fire, etc).
1069 * However, it also causes the look window to be re-drawn 1083 * However, it also causes the look window to be re-drawn
1070 * 3 times each time the player moves, because many of the 1084 * 3 times each time the player moves, because many of the
… …
1089 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1103 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1090 { 1104 {
1091 middle = tmp; 1105 middle = tmp;
1092 anywhere = 1; 1106 anywhere = 1;
1093 } 1107 }
1108
1094 /* Find the highest visible face around. If equal 1109 /* Find the highest visible face around. If equal
1095 * visibilities, we still want the one nearer to the 1110 * visibilities, we still want the one nearer to the
1096 * top 1111 * top
1097 */ 1112 */
1098 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1113 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1147 * 1) top face is set, need middle to be set. 1162 * 1) top face is set, need middle to be set.
1148 * 2) middle is set, need to set top. 1163 * 2) middle is set, need to set top.
1149 * 3) neither middle or top is set - need to set both. 1164 * 3) neither middle or top is set - need to set both.
1150 */ 1165 */
1151 1166
1152 for (tmp = last; tmp; tmp = tmp->below) 1167 for (object *tmp = last; tmp; tmp = tmp->below)
1153 { 1168 {
1154 /* Once we get to a floor, stop, since we already have a floor object */ 1169 /* Once we get to a floor, stop, since we already have a floor object */
1155 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1170 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1156 break; 1171 break;
1157 1172
… …
1209 vol += op->volume (); 1224 vol += op->volume ();
1210 1225
1211 return vol; 1226 return vol;
1212} 1227}
1213 1228
1214/* this updates the orig_map->tile_map[tile_num] value after finding 1229bool
1215 * the map. It also takes care of linking back the freshly found 1230maptile::tile_available (int dir, bool load)
1216 * maps tile_map values if it tiles back to this one. It returns
1217 * the value of orig_map->tile_map[tile_num].
1218 */
1219static inline maptile *
1220find_and_link (maptile *orig_map, int tile_num)
1221{ 1231{
1222 maptile *mp = orig_map->tile_map [tile_num]; 1232 if (!tile_path[dir])
1233 return 0;
1223 1234
1224 if (!mp) 1235 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1225 { 1236 return 1;
1226 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1227 1237
1228 if (!mp) 1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1229 { 1239 return 1;
1230 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1231 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1232 &orig_map->tile_path[tile_num], &orig_map->path);
1233 mp = new maptile (1, 1);
1234 mp->alloc ();
1235 mp->in_memory = MAP_IN_MEMORY;
1236 }
1237 }
1238 1240
1239 int dest_tile = (tile_num + 2) % 4;
1240
1241 orig_map->tile_map [tile_num] = mp;
1242
1243 // optimisation: back-link map to origin map if euclidean
1244 //TODO: non-euclidean maps MUST GO
1245 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1246 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1247
1248 return mp; 1241 return 0;
1249}
1250
1251static inline void
1252load_and_link (maptile *orig_map, int tile_num)
1253{
1254 find_and_link (orig_map, tile_num)->load_sync ();
1255} 1242}
1256 1243
1257/* this returns TRUE if the coordinates (x,y) are out of 1244/* this returns TRUE if the coordinates (x,y) are out of
1258 * map m. This function also takes into account any 1245 * map m. This function also takes into account any
1259 * tiling considerations, loading adjacant maps as needed. 1246 * tiling considerations, loading adjacant maps as needed.
… …
1272 if (!m) 1259 if (!m)
1273 return 0; 1260 return 0;
1274 1261
1275 if (x < 0) 1262 if (x < 0)
1276 { 1263 {
1277 if (!m->tile_path[3]) 1264 if (!m->tile_available (3))
1278 return 1; 1265 return 1;
1279 1266
1280 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1281 find_and_link (m, 3);
1282
1283 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1267 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1284 } 1268 }
1285 1269
1286 if (x >= m->width) 1270 if (x >= m->width)
1287 { 1271 {
1288 if (!m->tile_path[1]) 1272 if (!m->tile_available (1))
1289 return 1; 1273 return 1;
1290 1274
1291 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1292 find_and_link (m, 1);
1293
1294 return out_of_map (m->tile_map[1], x - m->width, y); 1275 return out_of_map (m->tile_map[1], x - m->width, y);
1295 } 1276 }
1296 1277
1297 if (y < 0) 1278 if (y < 0)
1298 { 1279 {
1299 if (!m->tile_path[0]) 1280 if (!m->tile_available (0))
1300 return 1; 1281 return 1;
1301 1282
1302 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1303 find_and_link (m, 0);
1304
1305 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1283 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1306 } 1284 }
1307 1285
1308 if (y >= m->height) 1286 if (y >= m->height)
1309 { 1287 {
1310 if (!m->tile_path[2]) 1288 if (!m->tile_available (2))
1311 return 1; 1289 return 1;
1312
1313 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1314 find_and_link (m, 2);
1315 1290
1316 return out_of_map (m->tile_map[2], x, y - m->height); 1291 return out_of_map (m->tile_map[2], x, y - m->height);
1317 } 1292 }
1318 1293
1319 /* Simple case - coordinates are within this local 1294 /* Simple case - coordinates are within this local
… …
1333maptile * 1308maptile *
1334maptile::xy_find (sint16 &x, sint16 &y) 1309maptile::xy_find (sint16 &x, sint16 &y)
1335{ 1310{
1336 if (x < 0) 1311 if (x < 0)
1337 { 1312 {
1338 if (!tile_path[3]) 1313 if (!tile_available (3))
1339 return 0; 1314 return 0;
1340 1315
1341 find_and_link (this, 3);
1342 x += tile_map[3]->width; 1316 x += tile_map[3]->width;
1343 return tile_map[3]->xy_find (x, y); 1317 return tile_map[3]->xy_find (x, y);
1344 } 1318 }
1345 1319
1346 if (x >= width) 1320 if (x >= width)
1347 { 1321 {
1348 if (!tile_path[1]) 1322 if (!tile_available (1))
1349 return 0; 1323 return 0;
1350 1324
1351 find_and_link (this, 1);
1352 x -= width; 1325 x -= width;
1353 return tile_map[1]->xy_find (x, y); 1326 return tile_map[1]->xy_find (x, y);
1354 } 1327 }
1355 1328
1356 if (y < 0) 1329 if (y < 0)
1357 { 1330 {
1358 if (!tile_path[0]) 1331 if (!tile_available (0))
1359 return 0; 1332 return 0;
1360 1333
1361 find_and_link (this, 0);
1362 y += tile_map[0]->height; 1334 y += tile_map[0]->height;
1363 return tile_map[0]->xy_find (x, y); 1335 return tile_map[0]->xy_find (x, y);
1364 } 1336 }
1365 1337
1366 if (y >= height) 1338 if (y >= height)
1367 { 1339 {
1368 if (!tile_path[2]) 1340 if (!tile_available (2))
1369 return 0; 1341 return 0;
1370 1342
1371 find_and_link (this, 2);
1372 y -= height; 1343 y -= height;
1373 return tile_map[2]->xy_find (x, y); 1344 return tile_map[2]->xy_find (x, y);
1374 } 1345 }
1375 1346
1376 /* Simple case - coordinates are within this local 1347 /* Simple case - coordinates are within this local
… …
1387adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1358adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1388{ 1359{
1389 if (!map1 || !map2) 1360 if (!map1 || !map2)
1390 return 0; 1361 return 0;
1391 1362
1392 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1363 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1393 //fix: compare paths instead (this is likely faster, too!) 1364 //fix: compare paths instead (this is likely faster, too!)
1394 if (map1 == map2) 1365 if (map1 == map2)
1395 { 1366 {
1396 *dx = 0; 1367 *dx = 0;
1397 *dy = 0; 1368 *dy = 0;
… …
1604} 1575}
1605 1576
1606object * 1577object *
1607maptile::insert (object *op, int x, int y, object *originator, int flags) 1578maptile::insert (object *op, int x, int y, object *originator, int flags)
1608{ 1579{
1609 if (!op->flag [FLAG_REMOVED])
1610 op->remove ();
1611
1612 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1580 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1613} 1581}
1614 1582
1615region * 1583region *
1616maptile::region (int x, int y) const 1584maptile::region (int x, int y) const
… …
1626 1594
1627 return ::region::default_region (); 1595 return ::region::default_region ();
1628} 1596}
1629 1597
1630/* picks a random object from a style map. 1598/* picks a random object from a style map.
1631 * Redone by MSW so it should be faster and not use static
1632 * variables to generate tables.
1633 */ 1599 */
1634object * 1600object *
1635maptile::pick_random_object () const 1601maptile::pick_random_object (rand_gen &gen) const
1636{ 1602{
1637 /* while returning a null object will result in a crash, that 1603 /* while returning a null object will result in a crash, that
1638 * is actually preferable to an infinite loop. That is because 1604 * is actually preferable to an infinite loop. That is because
1639 * most servers will automatically restart in case of crash. 1605 * most servers will automatically restart in case of crash.
1640 * Change the logic on getting the random space - shouldn't make 1606 * Change the logic on getting the random space - shouldn't make
1641 * any difference, but this seems clearer to me. 1607 * any difference, but this seems clearer to me.
1642 */ 1608 */
1643 for (int i = 1000; --i;) 1609 for (int i = 1000; --i;)
1644 { 1610 {
1645 object *pick = at (rndm (width), rndm (height)).bot; 1611 object *pick = at (gen (width), gen (height)).bot;
1646 1612
1647 // do not prefer big monsters just because they are big. 1613 // do not prefer big monsters just because they are big.
1648 if (pick && pick->head_ () == pick) 1614 if (pick && pick->is_head ())
1649 return pick->head_ (); 1615 return pick->head_ ();
1650 } 1616 }
1651 1617
1652 // instead of crashing in the unlikely(?) case, try to return *something* 1618 // instead of crashing in the unlikely(?) case, try to return *something*
1653 return get_archetype ("blocked"); 1619 return archetype::find ("bug");
1654} 1620}
1655 1621
1622void
1623maptile::play_sound (faceidx sound, int x, int y) const
1624{
1625 if (!sound)
1626 return;
1627
1628 for_all_players (pl)
1629 if (pl->ob->map == this)
1630 if (client *ns = pl->ns)
1631 {
1632 int dx = x - pl->ob->x;
1633 int dy = y - pl->ob->y;
1634
1635 int distance = idistance (dx, dy);
1636
1637 if (distance <= MAX_SOUND_DISTANCE)
1638 ns->play_sound (sound, dx, dy);
1639 }
1640}
1641

Diff Legend

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