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.103 by root, Thu May 17 23:35:19 2007 UTC vs.
Revision 1.141 by root, Wed May 7 11:02:50 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
… …
233 } 165 }
234 return 0; 166 return 0;
235} 167}
236 168
237/* 169/*
238 * 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
239 * This is meant for multi space objects - for single space objecs, 171 * spot. This is meant for multi space objects - for single space objecs,
240 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
241 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
242 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
243 * 175 *
244 * 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.
245 * 177 *
246 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
247 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
258 * 190 *
259 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
260 * 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
261 * against the move_block values. 193 * against the move_block values.
262 */ 194 */
263int 195bool
264ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
265{ 197{
266 archetype *tmp; 198 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
267 int flag;
268 maptile *m1;
269 sint16 sx, sy;
270
271 if (!ob)
272 {
273 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
274 if (flag & P_OUT_OF_MAP)
275 return P_OUT_OF_MAP;
276
277 /* don't have object, so don't know what types would block */
278 return m1->at (sx, sy).move_block;
279 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
280 201
281 for (tmp = ob->arch; tmp; tmp = tmp->more) 202 if (!pos.normalise ())
282 { 203 return 1;
283 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
284 204
285 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
286 return P_OUT_OF_MAP; 206
287 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
288 return P_IS_ALIVE; 208 return 1;
289 209
290 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
291 211 * (signifying non-moving objects)
292 /* find_first_free_spot() calls this function. However, often
293 * ob doesn't have any move type (when used to place exits)
294 * 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.
295 */ 213 */
296
297 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
298 continue; 215 continue;
299 216
300 /* 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
301 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
302 */ 219 */
303 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
304 return P_NO_PASS; 221 return 1;
305 } 222 }
306 223
307 return 0; 224 return 0;
308} 225}
309 226
… …
327 244
328 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
329 tmp = next; 246 tmp = next;
330 } 247 }
331 248
332 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
333 * carrying. 250 //TODO: remove
334 */ 251 container->update_weight ();
335 sum_weight (container);
336} 252}
337 253
338void 254void
339maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
340{ 256{
… …
356{ 272{
357 if (!spaces) 273 if (!spaces)
358 return; 274 return;
359 275
360 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 276 for (mapspace *ms = spaces + size (); ms-- > spaces; )
361 for (object *op = ms->bot; op; op = op->above) 277 {
278 object *op = ms->bot;
279 while (op)
362 { 280 {
363 /* already multipart - don't do anything more */ 281 /* already multipart - don't do anything more */
364 if (op->head_ () == op && !op->more && op->arch->more) 282 if (op->head_ () == op && !op->more && op->arch->more)
365 { 283 {
366 op->remove (); 284 op->remove ();
367 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
368 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
369 } 294 }
295 else
296 op = op->above;
370 } 297 }
298 }
371} 299}
372 300
373/* 301/*
374 * 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
375 * file pointer. 303 * file pointer.
… …
377bool 305bool
378maptile::_load_objects (object_thawer &f) 306maptile::_load_objects (object_thawer &f)
379{ 307{
380 for (;;) 308 for (;;)
381 { 309 {
382 coroapi::cede_to_tick_every (100); // cede once in a while 310 coroapi::cede_to_tick (); // cede once in a while
383 311
384 switch (f.kw) 312 switch (f.kw)
385 { 313 {
386 case KW_arch: 314 case KW_arch:
387 if (object *op = object::read (f, this)) 315 if (object *op = object::read (f, this))
388 { 316 {
317 // TODO: why?
389 if (op->inv) 318 if (op->inv)
390 sum_weight (op); 319 op->update_weight ();
391 320
392 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 }
393 } 347 }
394 348
395 continue; 349 continue;
396 350
397 case KW_EOF: 351 case KW_EOF:
… …
410} 364}
411 365
412void 366void
413maptile::activate () 367maptile::activate ()
414{ 368{
415 active = true;
416
417 if (spaces) 369 if (spaces)
418 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
419 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
420 op->activate_recursive (); 372 op->activate_recursive ();
421} 373}
422 374
423void 375void
424maptile::deactivate () 376maptile::deactivate ()
425{ 377{
426 active = false;
427
428 if (spaces) 378 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 379 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 380 for (object *op = ms->bot; op; op = op->above)
431 op->deactivate_recursive (); 381 op->deactivate_recursive ();
432} 382}
… …
442 if (!spaces) 392 if (!spaces)
443 return false; 393 return false;
444 394
445 for (int i = 0; i < size (); ++i) 395 for (int i = 0; i < size (); ++i)
446 { 396 {
447 int unique = 0; 397 bool unique = 0;
398
448 for (object *op = spaces [i].bot; op; op = op->above) 399 for (object *op = spaces [i].bot; op; op = op->above)
449 { 400 {
450 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 401 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
451 unique = 1;
452 402
453 if (!op->can_map_save ()) 403 if (expect_false (!op->can_map_save ()))
454 continue; 404 continue;
455 405
456 if (unique || op->flag [FLAG_UNIQUE]) 406 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
457 { 407 {
458 if (flags & IO_UNIQUES) 408 if (flags & IO_UNIQUES)
459 op->write (f); 409 op->write (f);
460 } 410 }
461 else if (flags & IO_OBJECTS) 411 else if (expect_true (flags & IO_OBJECTS))
462 op->write (f); 412 op->write (f);
463 } 413 }
464 } 414 }
465 415
466 coroapi::cede_to_tick (); 416 coroapi::cede_to_tick ();
467 417
468 return true; 418 return true;
469}
470
471bool
472maptile::_load_objects (const char *path, bool skip_header)
473{
474 object_thawer f (path);
475
476 if (!f)
477 return false;
478
479 f.next ();
480
481 if (skip_header)
482 for (;;)
483 {
484 keyword kw = f.kw;
485 f.skip ();
486 if (kw == KW_end)
487 break;
488 }
489
490 return _load_objects (f);
491} 419}
492 420
493bool 421bool
494maptile::_save_objects (const char *path, int flags) 422maptile::_save_objects (const char *path, int flags)
495{ 423{
… …
670bool 598bool
671maptile::_load_header (object_thawer &thawer) 599maptile::_load_header (object_thawer &thawer)
672{ 600{
673 for (;;) 601 for (;;)
674 { 602 {
675 keyword kw = thawer.get_kv ();
676
677 switch (kw) 603 switch (thawer.kw)
678 { 604 {
679 case KW_msg: 605 case KW_msg:
680 thawer.get_ml (KW_endmsg, msg); 606 thawer.get_ml (KW_endmsg, msg);
681 break; 607 break;
682 608
… …
714 case KW_winddir: thawer.get (winddir); break; 640 case KW_winddir: thawer.get (winddir); break;
715 case KW_sky: thawer.get (sky); break; 641 case KW_sky: thawer.get (sky); break;
716 642
717 case KW_per_player: thawer.get (per_player); break; 643 case KW_per_player: thawer.get (per_player); break;
718 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;
719 647
720 case KW_region: default_region = region::find (thawer.get_str ()); break; 648 case KW_region: default_region = region::find (thawer.get_str ()); break;
721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 649 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
722 650
723 // old names new names 651 // old names new names
… …
734 case KW_tile_path_1: thawer.get (tile_path [0]); break; 662 case KW_tile_path_1: thawer.get (tile_path [0]); break;
735 case KW_tile_path_2: thawer.get (tile_path [1]); break; 663 case KW_tile_path_2: thawer.get (tile_path [1]); break;
736 case KW_tile_path_3: thawer.get (tile_path [2]); break; 664 case KW_tile_path_3: thawer.get (tile_path [2]); break;
737 case KW_tile_path_4: thawer.get (tile_path [3]); break; 665 case KW_tile_path_4: thawer.get (tile_path [3]); break;
738 666
667 case KW_ERROR:
668 set_key_text (thawer.kw_str, thawer.value);
669 break;
670
739 case KW_end: 671 case KW_end:
672 thawer.next ();
740 return true; 673 return true;
741 674
742 default: 675 default:
743 if (!thawer.parse_error ("map", 0)) 676 if (!thawer.parse_error ("map", 0))
744 return false; 677 return false;
745 break; 678 break;
746 } 679 }
680
681 thawer.next ();
747 } 682 }
748 683
749 abort (); 684 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} 685}
762 686
763/****************************************************************************** 687/******************************************************************************
764 * This is the start of unique map handling code 688 * This is the start of unique map handling code
765 *****************************************************************************/ 689 *****************************************************************************/
… …
800 if (name) MAP_OUT (name); 724 if (name) MAP_OUT (name);
801 MAP_OUT (swap_time); 725 MAP_OUT (swap_time);
802 MAP_OUT (reset_time); 726 MAP_OUT (reset_time);
803 MAP_OUT (reset_timeout); 727 MAP_OUT (reset_timeout);
804 MAP_OUT (fixed_resettime); 728 MAP_OUT (fixed_resettime);
729 MAP_OUT (no_reset);
730 MAP_OUT (no_drop);
805 MAP_OUT (difficulty); 731 MAP_OUT (difficulty);
806 732
807 if (default_region) MAP_OUT2 (region, default_region->name); 733 if (default_region) MAP_OUT2 (region, default_region->name);
808 734
809 if (shopitems) 735 if (shopitems)
… …
863 * Remove and free all objects in the given map. 789 * Remove and free all objects in the given map.
864 */ 790 */
865void 791void
866maptile::clear () 792maptile::clear ()
867{ 793{
868 sfree (regions, size ()), regions = 0;
869 free (regionmap), regionmap = 0;
870
871 if (spaces) 794 if (spaces)
872 { 795 {
873 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 796 for (mapspace *ms = spaces + size (); ms-- > spaces; )
874 while (object *op = ms->bot->head_ ()) 797 while (object *op = ms->bot)
875 { 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 {
876 op->destroy_inv (false); 808 op->destroy_inv (false);
877 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 }
878 } 816 }
879 817
880 sfree (spaces, size ()), spaces = 0; 818 sfree0 (spaces, size ());
881 } 819 }
882 820
883 if (buttons) 821 if (buttons)
884 free_objectlinkpt (buttons), buttons = 0; 822 free_objectlinkpt (buttons), buttons = 0;
823
824 sfree0 (regions, size ());
825 delete [] regionmap; regionmap = 0;
885} 826}
886 827
887void 828void
888maptile::clear_header () 829maptile::clear_header ()
889{ 830{
… …
919maptile::do_destroy () 860maptile::do_destroy ()
920{ 861{
921 attachable::do_destroy (); 862 attachable::do_destroy ();
922 863
923 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 }
924} 932}
925 933
926/* 934/*
927 * 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).
928 */ 936 */
… …
975 983
976 if (QUERY_FLAG (op, FLAG_GENERATOR)) 984 if (QUERY_FLAG (op, FLAG_GENERATOR))
977 { 985 {
978 total_exp += op->stats.exp; 986 total_exp += op->stats.exp;
979 987
980 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 988 if (archetype *at = op->other_arch)
989 {
981 total_exp += at->clone.stats.exp * 8; 990 total_exp += at->stats.exp * 8;
982
983 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 }
984 } 999 }
985 } 1000 }
986 1001
987 avgexp = (double) total_exp / monster_cnt; 1002 avgexp = (double) total_exp / monster_cnt;
988 1003
… …
1058 /* This could be made additive I guess (two lights better than 1073 /* This could be made additive I guess (two lights better than
1059 * one). But if so, it shouldn't be a simple additive - 2 1074 * one). But if so, it shouldn't be a simple additive - 2
1060 * light bulbs do not illuminate twice as far as once since 1075 * light bulbs do not illuminate twice as far as once since
1061 * it is a dissapation factor that is cubed. 1076 * it is a dissapation factor that is cubed.
1062 */ 1077 */
1063 if (tmp->glow_radius > light)
1064 light = tmp->glow_radius; 1078 light = max (light, tmp->glow_radius);
1065 1079
1066 /* This call is needed in order to update objects the player 1080 /* This call is needed in order to update objects the player
1067 * is standing in that have animations (ie, grass, fire, etc). 1081 * is standing in that have animations (ie, grass, fire, etc).
1068 * However, it also causes the look window to be re-drawn 1082 * However, it also causes the look window to be re-drawn
1069 * 3 times each time the player moves, because many of the 1083 * 3 times each time the player moves, because many of the
… …
1208 vol += op->volume (); 1222 vol += op->volume ();
1209 1223
1210 return vol; 1224 return vol;
1211} 1225}
1212 1226
1213/* this updates the orig_map->tile_map[tile_num] value after finding 1227bool
1214 * the map. It also takes care of linking back the freshly found 1228maptile::tile_available (int dir, bool load)
1215 * maps tile_map values if it tiles back to this one. It returns
1216 * the value of orig_map->tile_map[tile_num].
1217 */
1218static inline maptile *
1219find_and_link (maptile *orig_map, int tile_num)
1220{ 1229{
1221 maptile *mp = orig_map->tile_map [tile_num]; 1230 if (!tile_path[dir])
1231 return 0;
1222 1232
1223 if (!mp) 1233 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1224 { 1234 return 1;
1225 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1226 1235
1227 if (!mp) 1236 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1228 { 1237 return 1;
1229 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1230 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1231 &orig_map->tile_path[tile_num], &orig_map->path);
1232 mp = new maptile (1, 1);
1233 mp->alloc ();
1234 mp->in_memory = MAP_IN_MEMORY;
1235 }
1236 }
1237 1238
1238 int dest_tile = (tile_num + 2) % 4;
1239
1240 orig_map->tile_map [tile_num] = mp;
1241
1242 // optimisation: back-link map to origin map if euclidean
1243 //TODO: non-euclidean maps MUST GO
1244 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1245 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1246
1247 return mp; 1239 return 0;
1248}
1249
1250static inline void
1251load_and_link (maptile *orig_map, int tile_num)
1252{
1253 find_and_link (orig_map, tile_num)->load_sync ();
1254} 1240}
1255 1241
1256/* this returns TRUE if the coordinates (x,y) are out of 1242/* this returns TRUE if the coordinates (x,y) are out of
1257 * map m. This function also takes into account any 1243 * map m. This function also takes into account any
1258 * tiling considerations, loading adjacant maps as needed. 1244 * tiling considerations, loading adjacant maps as needed.
… …
1271 if (!m) 1257 if (!m)
1272 return 0; 1258 return 0;
1273 1259
1274 if (x < 0) 1260 if (x < 0)
1275 { 1261 {
1276 if (!m->tile_path[3]) 1262 if (!m->tile_available (3))
1277 return 1; 1263 return 1;
1278 1264
1279 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1280 find_and_link (m, 3);
1281
1282 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1265 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1283 } 1266 }
1284 1267
1285 if (x >= m->width) 1268 if (x >= m->width)
1286 { 1269 {
1287 if (!m->tile_path[1]) 1270 if (!m->tile_available (1))
1288 return 1; 1271 return 1;
1289 1272
1290 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1291 find_and_link (m, 1);
1292
1293 return out_of_map (m->tile_map[1], x - m->width, y); 1273 return out_of_map (m->tile_map[1], x - m->width, y);
1294 } 1274 }
1295 1275
1296 if (y < 0) 1276 if (y < 0)
1297 { 1277 {
1298 if (!m->tile_path[0]) 1278 if (!m->tile_available (0))
1299 return 1; 1279 return 1;
1300 1280
1301 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1302 find_and_link (m, 0);
1303
1304 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1281 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1305 } 1282 }
1306 1283
1307 if (y >= m->height) 1284 if (y >= m->height)
1308 { 1285 {
1309 if (!m->tile_path[2]) 1286 if (!m->tile_available (2))
1310 return 1; 1287 return 1;
1311
1312 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1313 find_and_link (m, 2);
1314 1288
1315 return out_of_map (m->tile_map[2], x, y - m->height); 1289 return out_of_map (m->tile_map[2], x, y - m->height);
1316 } 1290 }
1317 1291
1318 /* Simple case - coordinates are within this local 1292 /* Simple case - coordinates are within this local
… …
1332maptile * 1306maptile *
1333maptile::xy_find (sint16 &x, sint16 &y) 1307maptile::xy_find (sint16 &x, sint16 &y)
1334{ 1308{
1335 if (x < 0) 1309 if (x < 0)
1336 { 1310 {
1337 if (!tile_path[3]) 1311 if (!tile_available (3))
1338 return 0; 1312 return 0;
1339 1313
1340 find_and_link (this, 3);
1341 x += tile_map[3]->width; 1314 x += tile_map[3]->width;
1342 return tile_map[3]->xy_find (x, y); 1315 return tile_map[3]->xy_find (x, y);
1343 } 1316 }
1344 1317
1345 if (x >= width) 1318 if (x >= width)
1346 { 1319 {
1347 if (!tile_path[1]) 1320 if (!tile_available (1))
1348 return 0; 1321 return 0;
1349 1322
1350 find_and_link (this, 1);
1351 x -= width; 1323 x -= width;
1352 return tile_map[1]->xy_find (x, y); 1324 return tile_map[1]->xy_find (x, y);
1353 } 1325 }
1354 1326
1355 if (y < 0) 1327 if (y < 0)
1356 { 1328 {
1357 if (!tile_path[0]) 1329 if (!tile_available (0))
1358 return 0; 1330 return 0;
1359 1331
1360 find_and_link (this, 0);
1361 y += tile_map[0]->height; 1332 y += tile_map[0]->height;
1362 return tile_map[0]->xy_find (x, y); 1333 return tile_map[0]->xy_find (x, y);
1363 } 1334 }
1364 1335
1365 if (y >= height) 1336 if (y >= height)
1366 { 1337 {
1367 if (!tile_path[2]) 1338 if (!tile_available (2))
1368 return 0; 1339 return 0;
1369 1340
1370 find_and_link (this, 2);
1371 y -= height; 1341 y -= height;
1372 return tile_map[2]->xy_find (x, y); 1342 return tile_map[2]->xy_find (x, y);
1373 } 1343 }
1374 1344
1375 /* Simple case - coordinates are within this local 1345 /* Simple case - coordinates are within this local
… …
1386adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1356adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1387{ 1357{
1388 if (!map1 || !map2) 1358 if (!map1 || !map2)
1389 return 0; 1359 return 0;
1390 1360
1391 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1361 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1392 //fix: compare paths instead (this is likely faster, too!) 1362 //fix: compare paths instead (this is likely faster, too!)
1393 if (map1 == map2) 1363 if (map1 == map2)
1394 { 1364 {
1395 *dx = 0; 1365 *dx = 0;
1396 *dy = 0; 1366 *dy = 0;
… …
1625 1595
1626 return ::region::default_region (); 1596 return ::region::default_region ();
1627} 1597}
1628 1598
1629/* picks a random object from a style map. 1599/* picks a random object from a style map.
1630 * Redone by MSW so it should be faster and not use static
1631 * variables to generate tables.
1632 */ 1600 */
1633object * 1601object *
1634maptile::pick_random_object () const 1602maptile::pick_random_object (rand_gen &gen) const
1635{ 1603{
1636 /* while returning a null object will result in a crash, that 1604 /* while returning a null object will result in a crash, that
1637 * is actually preferable to an infinite loop. That is because 1605 * is actually preferable to an infinite loop. That is because
1638 * most servers will automatically restart in case of crash. 1606 * most servers will automatically restart in case of crash.
1639 * Change the logic on getting the random space - shouldn't make 1607 * Change the logic on getting the random space - shouldn't make
1640 * any difference, but this seems clearer to me. 1608 * any difference, but this seems clearer to me.
1641 */ 1609 */
1642 for (int i = 1000; --i;) 1610 for (int i = 1000; --i;)
1643 { 1611 {
1644 object *pick = at (rndm (width), rndm (height)).bot; 1612 object *pick = at (gen (width), gen (height)).bot;
1645 1613
1646 // do not prefer big monsters just because they are big. 1614 // do not prefer big monsters just because they are big.
1647 if (pick && pick->head_ () == pick) 1615 if (pick && pick->is_head ())
1648 return pick->head_ (); 1616 return pick->head_ ();
1649 } 1617 }
1650 1618
1651 // instead of crashing in the unlikely(?) case, try to return *something* 1619 // instead of crashing in the unlikely(?) case, try to return *something*
1652 return get_archetype ("blocked"); 1620 return archetype::find ("bug");
1653} 1621}
1654 1622
1623void
1624maptile::play_sound (faceidx sound, int x, int y) const
1625{
1626 if (!sound)
1627 return;
1628
1629 for_all_players (pl)
1630 if (pl->ob->map == this)
1631 if (client *ns = pl->ns)
1632 {
1633 int dx = x - pl->ob->x;
1634 int dy = y - pl->ob->y;
1635
1636 int distance = idistance (dx, dy);
1637
1638 if (distance <= MAX_SOUND_DISTANCE)
1639 ns->play_sound (sound, dx, dy);
1640 }
1641}
1642

Diff Legend

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