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.175 by root, Tue Nov 10 05:06:02 2009 UTC vs.
Revision 1.216 by root, Sun May 8 21:51:26 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
23 */ 23 */
24 24
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include "global.h" 27#include "global.h"
28#include "loader.h"
29#include "path.h" 28#include "path.h"
30 29
31//+GPL 30//+GPL
32 31
33sint8 maptile::outdoor_darkness; 32sint8 maptile::outdoor_darkness;
… …
78 /* Make sure the coordinates are valid - they should be, as caller should 77 /* Make sure the coordinates are valid - they should be, as caller should
79 * have already checked this. 78 * have already checked this.
80 */ 79 */
81 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
82 { 81 {
83 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 82 LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
84 return 1; 83 return 1;
85 } 84 }
86 85
87 mapspace &ms = m->at (sx, sy); 86 mapspace &ms = m->at (sx, sy);
88 87
… …
91 90
92 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
93 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
94 * things we need to do for players. 93 * things we need to do for players.
95 */ 94 */
96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
97 return 0; 96 return 0;
98 97
99 /* if there isn't anything alive on this space, and this space isn't 98 /* if there isn't anything alive on this space, and this space isn't
100 * otherwise blocked, we can return now. Only if there is a living 99 * otherwise blocked, we can return now. Only if there is a living
101 * creature do we need to investigate if it is part of this creature 100 * creature do we need to investigate if it is part of this creature
… …
111 /* We basically go through the stack of objects, and if there is 110 /* We basically go through the stack of objects, and if there is
112 * some other object that has NO_PASS or FLAG_ALIVE set, return 111 * some other object that has NO_PASS or FLAG_ALIVE set, return
113 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
114 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
115 */ 114 */
116 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 115 for (object *tmp = ms.top; tmp; tmp = tmp->below)
117 { 116 {
118 if (OB_MOVE_BLOCK (ob, tmp)) 117 if (OB_MOVE_BLOCK (ob, tmp))
119 { 118 {
120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob)) 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
121 if (RESULT_INT (0)) 120 if (RESULT_INT (0))
… …
145 return 1; // unconditional block 144 return 1; // unconditional block
146 145
147 } else { 146 } else {
148 // space does not block the ob, directly, but 147 // space does not block the ob, directly, but
149 // anything alive that is not a door still 148 // anything alive that is not a door still
150 // blocks anything but wizards. 149 // blocks anything
151 150
152 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
153 && tmp->head_ () != ob
154 && tmp != ob
155 && tmp->type != DOOR 152 && tmp->type != DOOR
156 && !tmp->flag [FLAG_WIZPASS]) 153 && tmp->head_ () != ob) //TODO: maybe move these check up?
157 return 1; 154 return 1;
158 } 155 }
159 } 156 }
160 157
161 return 0; 158 return 0;
162} 159}
163 160
164/* 161/*
165 * Returns qthe blocking object if the given object can't fit in the given 162 * Returns the blocking object if the given object can't fit in the given
166 * spot. This is meant for multi space objects - for single space objecs, 163 * spot. This is meant for multi space objects - for single space objecs,
167 * just calling get_map_blocked and checking that against movement type 164 * just calling get_map_blocked and checking that against movement type
168 * of object. This function goes through all the parts of the multipart 165 * of object. This function goes through all the parts of the multipart
169 * object and makes sure they can be inserted. 166 * object and makes sure they can be inserted.
170 * 167 *
… …
243 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 240 for (mapspace *ms = spaces + size (); ms-- > spaces; )
244 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 241 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
245 INVOKE_OBJECT (RESET, tmp); 242 INVOKE_OBJECT (RESET, tmp);
246} 243}
247 244
245void
246maptile::post_load ()
247{
248#if 0
249 if (!spaces)
250 return;
251
252 for (mapspace *ms = spaces + size (); ms-- > spaces; )
253 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
254 ; // nop
255#endif
256}
257
248//+GPL 258//+GPL
249 259
250/* link_multipart_objects go through all the objects on the map looking 260/* link_multipart_objects go through all the objects on the map looking
251 * for objects whose arch says they are multipart yet according to the 261 * for objects whose arch says they are multipart yet according to the
252 * info we have, they only have the head (as would be expected when 262 * info we have, they only have the head (as would be expected when
… …
301 case KW_arch: 311 case KW_arch:
302 if (object *op = object::read (f, this)) 312 if (object *op = object::read (f, this))
303 { 313 {
304 // TODO: why? 314 // TODO: why?
305 if (op->inv) 315 if (op->inv)
316 {
317 op->carrying = 0;
306 op->update_weight (); 318 op->update_weight ();
319 }
307 320
308 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
309 { 322 {
310 // we insert manually because 323 // we insert manually because
311 // a) its way faster 324 // a) its way faster
… …
348} 361}
349 362
350void 363void
351maptile::activate () 364maptile::activate ()
352{ 365{
353 if (spaces) 366 if (state != MAP_INACTIVE)
367 return;
368
354 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 369 for (mapspace *ms = spaces + size (); ms-- > spaces; )
355 for (object *op = ms->bot; op; op = op->above) 370 for (object *op = ms->bot; op; op = op->above)
356 op->activate_recursive (); 371 op->activate_recursive ();
372
373 state = MAP_ACTIVE;
374
375 activate_physics ();
357} 376}
358 377
359void 378void
360maptile::deactivate () 379maptile::deactivate ()
361{ 380{
362 if (spaces) 381 if (state != MAP_ACTIVE)
382 return;
383
363 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 384 for (mapspace *ms = spaces + size (); ms-- > spaces; )
364 for (object *op = ms->bot; op; op = op->above) 385 for (object *op = ms->bot; op; op = op->above)
365 op->deactivate_recursive (); 386 op->deactivate_recursive ();
387
388 state = MAP_INACTIVE;
366} 389}
367 390
368bool 391bool
369maptile::_save_objects (object_freezer &f, int flags) 392maptile::_save_objects (object_freezer &f, int flags)
370{ 393{
… …
411 return false; 434 return false;
412 435
413 return freezer.save (path); 436 return freezer.save (path);
414} 437}
415 438
416maptile::maptile () 439void
440maptile::init ()
417{ 441{
418 in_memory = MAP_SWAPPED; 442 state = MAP_SWAPPED;
419 443
420 /* The maps used to pick up default x and y values from the 444 /* The maps used to pick up default x and y values from the
421 * map archetype. Mimic that behaviour. 445 * map archetype. Mimic that behaviour.
422 */ 446 */
423 width = 16; 447 width = 16;
424 height = 16; 448 height = 16;
425 timeout = 300; 449 timeout = 300;
426 max_items = MAX_ITEM_PER_ACTION; 450 max_items = MAX_ITEM_PER_ACTION;
427 max_volume = 2000000; // 2m³ 451 max_volume = 2000000; // 2m³
428}
429
430maptile::maptile (int w, int h)
431{
432 in_memory = MAP_SWAPPED;
433
434 width = w;
435 height = h;
436 reset_timeout = 0; 452 reset_timeout = 0;
437 timeout = 300;
438 enter_x = 0; 453 enter_x = 0;
439 enter_y = 0; 454 enter_y = 0;
455}
456
457maptile::maptile ()
458{
459 init ();
460}
461
462maptile::maptile (int w, int h)
463{
464 init ();
465
466 width = w;
467 height = h;
440 468
441 alloc (); 469 alloc ();
442} 470}
443 471
444/* 472/*
… …
515 *q = '\0'; 543 *q = '\0';
516 544
517 current_type = get_typedata_by_name (p); 545 current_type = get_typedata_by_name (p);
518 if (current_type) 546 if (current_type)
519 { 547 {
520 items[i].name = current_type->name; 548 items[i].name = current_type->name;
521 items[i].typenum = current_type->number; 549 items[i].typenum = current_type->number;
522 items[i].name_pl = current_type->name_pl; 550 items[i].name_pl = current_type->name_pl;
523 } 551 }
524 else 552 else
525 { /* oh uh, something's wrong, let's free up this one, and try 553 { /* oh uh, something's wrong, let's free up this one, and try
… …
544 * the map (or something equivilent) into output_string. */ 572 * the map (or something equivilent) into output_string. */
545static const char * 573static const char *
546print_shop_string (maptile *m) 574print_shop_string (maptile *m)
547{ 575{
548 static dynbuf_text buf; buf.clear (); 576 static dynbuf_text buf; buf.clear ();
577 bool first = true;
549 578
550 for (int i = 0; i < m->shopitems[0].index; i++) 579 for (int i = 0; i < m->shopitems[0].index; i++)
551 { 580 {
581 if (!first)
582 buf << ';';
583
584 first = false;
585
552 if (m->shopitems[i].typenum) 586 if (m->shopitems[i].typenum)
553 { 587 {
554 if (m->shopitems[i].strength) 588 if (m->shopitems[i].strength)
555 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 589 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
556 else 590 else
557 buf.printf ("%s;", m->shopitems[i].name); 591 buf.printf ("%s", m->shopitems[i].name);
558 } 592 }
559 else 593 else
560 { 594 {
561 if (m->shopitems[i].strength) 595 if (m->shopitems[i].strength)
562 buf.printf ("*:%d;", m->shopitems[i].strength); 596 buf.printf ("*:%d", m->shopitems[i].strength);
563 else 597 else
564 buf.printf ("*"); 598 buf.printf ("*");
565 } 599 }
566 } 600 }
567 601
… …
590 { 624 {
591 case KW_msg: 625 case KW_msg:
592 thawer.get_ml (KW_endmsg, msg); 626 thawer.get_ml (KW_endmsg, msg);
593 break; 627 break;
594 628
595 case KW_lore: // CF+ extension 629 case KW_lore: // deliantra extension
596 thawer.get_ml (KW_endlore, maplore); 630 thawer.get_ml (KW_endlore, maplore);
597 break; 631 break;
598 632
599 case KW_maplore: 633 case KW_maplore:
600 thawer.get_ml (KW_endmaplore, maplore); 634 thawer.get_ml (KW_endmaplore, maplore);
… …
617 case KW_shopgreed: thawer.get (shopgreed); break; 651 case KW_shopgreed: thawer.get (shopgreed); break;
618 case KW_shopmin: thawer.get (shopmin); break; 652 case KW_shopmin: thawer.get (shopmin); break;
619 case KW_shopmax: thawer.get (shopmax); break; 653 case KW_shopmax: thawer.get (shopmax); break;
620 case KW_shoprace: thawer.get (shoprace); break; 654 case KW_shoprace: thawer.get (shoprace); break;
621 case KW_outdoor: thawer.get (outdoor); break; 655 case KW_outdoor: thawer.get (outdoor); break;
622 case KW_temp: thawer.get (temp); break;
623 case KW_pressure: thawer.get (pressure); break;
624 case KW_humid: thawer.get (humid); break;
625 case KW_windspeed: thawer.get (windspeed); break;
626 case KW_winddir: thawer.get (winddir); break;
627 case KW_sky: thawer.get (sky); break;
628 656
629 case KW_per_player: thawer.get (per_player); break; 657 case KW_per_player: thawer.get (per_player); break;
630 case KW_per_party: thawer.get (per_party); break; 658 case KW_per_party: thawer.get (per_party); break;
631 case KW_no_reset: thawer.get (no_reset); break; 659 case KW_no_reset: thawer.get (no_reset); break;
632 case KW_no_drop: thawer.get (no_drop); break; 660 case KW_no_drop: thawer.get (no_drop); break;
633 661
634 case KW_region: default_region = region::find (thawer.get_str ()); break; 662 case KW_region: thawer.get (default_region); break;
635 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
636 664
637 // old names new names 665 // old names new names
638 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 666 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
639 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 667 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
643 case KW_value: case KW_swap_time: thawer.get (timeout); break; 671 case KW_value: case KW_swap_time: thawer.get (timeout); break;
644 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break; 672 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
645 case KW_invisible: case KW_darkness: thawer.get (darkness); break; 673 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
646 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break; 674 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
647 675
648 case KW_tile_path_1: thawer.get (tile_path [0]); break; 676 case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
649 case KW_tile_path_2: thawer.get (tile_path [1]); break; 677 case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
650 case KW_tile_path_3: thawer.get (tile_path [2]); break; 678 case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
651 case KW_tile_path_4: thawer.get (tile_path [3]); break; 679 case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
680 case KW_tile_path_5: thawer.get (tile_path [TILE_UP ]); break;
681 case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); break;
652 682
653 case KW_ERROR: 683 case KW_ERROR:
654 set_key_text (thawer.kw_str, thawer.value); 684 set_key_text (thawer.kw_str, thawer.value);
655 break; 685 break;
656 686
657 case KW_end: 687 case KW_end:
658 thawer.next (); 688 thawer.next ();
659 return true; 689 return true;
660 690
661 default: 691 default:
662 if (!thawer.parse_error ("map", 0)) 692 if (!thawer.parse_error ("map"))
663 return false; 693 return false;
664 break; 694 break;
665 } 695 }
666 696
667 thawer.next (); 697 thawer.next ();
… …
685 int unique = 0; 715 int unique = 0;
686 for (object *op = spaces [i].bot; op; ) 716 for (object *op = spaces [i].bot; op; )
687 { 717 {
688 object *above = op->above; 718 object *above = op->above;
689 719
690 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 720 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
691 unique = 1; 721 unique = 1;
692 722
693 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 723 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
694 op->destroy (); 724 op->destroy ();
695 725
696 op = above; 726 op = above;
697 } 727 }
698 } 728 }
… …
701//-GPL 731//-GPL
702 732
703bool 733bool
704maptile::_save_header (object_freezer &freezer) 734maptile::_save_header (object_freezer &freezer)
705{ 735{
706#define MAP_OUT(k) freezer.put (KW_ ## k, k) 736#define MAP_OUT(k) freezer.put (KW(k), k)
707#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 737#define MAP_OUT2(k,v) freezer.put (KW(k), v)
708 738
709 MAP_OUT2 (arch, "map"); 739 MAP_OUT2 (arch, CS(map));
710 740
711 if (name) MAP_OUT (name); 741 if (name) MAP_OUT (name);
712 MAP_OUT (swap_time); 742 MAP_OUT (swap_time);
713 MAP_OUT (reset_time); 743 MAP_OUT (reset_time);
714 MAP_OUT (reset_timeout); 744 MAP_OUT (reset_timeout);
… …
722 MAP_OUT (shopgreed); 752 MAP_OUT (shopgreed);
723 MAP_OUT (shopmin); 753 MAP_OUT (shopmin);
724 MAP_OUT (shopmax); 754 MAP_OUT (shopmax);
725 if (shoprace) MAP_OUT (shoprace); 755 if (shoprace) MAP_OUT (shoprace);
726 756
727 MAP_OUT (darkness);
728 MAP_OUT (width); 757 MAP_OUT (width);
729 MAP_OUT (height); 758 MAP_OUT (height);
730 MAP_OUT (enter_x); 759 MAP_OUT (enter_x);
731 MAP_OUT (enter_y); 760 MAP_OUT (enter_y);
732 761 MAP_OUT (darkness);
733 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
734 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
735
736 MAP_OUT (outdoor); 762 MAP_OUT (outdoor);
737 MAP_OUT (temp); 763
738 MAP_OUT (pressure); 764 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
739 MAP_OUT (humid); 765 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
740 MAP_OUT (windspeed);
741 MAP_OUT (winddir);
742 MAP_OUT (sky);
743 766
744 MAP_OUT (per_player); 767 MAP_OUT (per_player);
745 MAP_OUT (per_party); 768 MAP_OUT (per_party);
746 769
747 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 770 if (tile_path [TILE_NORTH]) MAP_OUT2 (tile_path_1, tile_path [TILE_NORTH]);
748 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 771 if (tile_path [TILE_EAST ]) MAP_OUT2 (tile_path_2, tile_path [TILE_EAST ]);
749 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 772 if (tile_path [TILE_SOUTH]) MAP_OUT2 (tile_path_3, tile_path [TILE_SOUTH]);
750 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 773 if (tile_path [TILE_WEST ]) MAP_OUT2 (tile_path_4, tile_path [TILE_WEST ]);
774 if (tile_path [TILE_UP ]) MAP_OUT2 (tile_path_5, tile_path [TILE_UP ]);
775 if (tile_path [TILE_DOWN ]) MAP_OUT2 (tile_path_6, tile_path [TILE_DOWN ]);
751 776
752 freezer.put (this); 777 freezer.put (this);
753 freezer.put (KW_end); 778 freezer.put (KW(end));
754 779
755 return true; 780 return true;
756} 781}
757 782
758bool 783bool
… …
812 msg = 0; 837 msg = 0;
813 maplore = 0; 838 maplore = 0;
814 shoprace = 0; 839 shoprace = 0;
815 delete [] shopitems, shopitems = 0; 840 delete [] shopitems, shopitems = 0;
816 841
817 for (int i = 0; i < 4; i++) 842 for (int i = 0; i < array_length (tile_path); i++)
818 tile_path [i] = 0; 843 tile_path [i] = 0;
819} 844}
820 845
821maptile::~maptile () 846maptile::~maptile ()
822{ 847{
… …
829 /* We need to look through all the maps and see if any maps 854 /* We need to look through all the maps and see if any maps
830 * are pointing at this one for tiling information. Since 855 * are pointing at this one for tiling information. Since
831 * tiling can be asymetric, we just can not look to see which 856 * tiling can be asymetric, we just can not look to see which
832 * maps this map tiles with and clears those. 857 * maps this map tiles with and clears those.
833 */ 858 */
834 for (int i = 0; i < 4; i++) 859 for (int i = 0; i < array_length (tile_path); i++)
835 if (tile_map[i] == m) 860 if (tile_map[i] == m)
836 tile_map[i] = 0; 861 tile_map[i] = 0;
837} 862}
838 863
839void 864void
… …
843 868
844 clear (); 869 clear ();
845} 870}
846 871
847/* decay and destroy perishable items in a map */ 872/* decay and destroy perishable items in a map */
873// TODO: should be done regularly, not on map load?
848void 874void
849maptile::do_decay_objects () 875maptile::do_decay_objects ()
850{ 876{
851 if (!spaces) 877 if (!spaces)
852 return; 878 return;
… …
854 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 880 for (mapspace *ms = spaces + size (); ms-- > spaces; )
855 for (object *above, *op = ms->bot; op; op = above) 881 for (object *above, *op = ms->bot; op; op = above)
856 { 882 {
857 above = op->above; 883 above = op->above;
858 884
885 // do not decay anything above unique floor tiles (yet :)
886 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
887 break;
888
859 bool destroy = 0; 889 bool destroy = 0;
860 890
861 // do not decay anything above unique floor tiles (yet :) 891 if (op->flag [FLAG_IS_FLOOR]
862 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 892 || op->flag [FLAG_OBJ_ORIGINAL]
863 break; 893 || op->flag [FLAG_UNIQUE]
864 894 || op->flag [FLAG_OVERLAY_FLOOR]
865 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 895 || op->flag [FLAG_UNPAID]
866 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
867 || QUERY_FLAG (op, FLAG_UNIQUE)
868 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
869 || QUERY_FLAG (op, FLAG_UNPAID)
870 || op->is_alive ()) 896 || op->is_alive ())
871 ; // do not decay 897 ; // do not decay
872 else if (op->is_weapon ()) 898 else if (op->is_weapon ())
873 { 899 {
874 op->stats.dam--; 900 op->stats.dam--;
… …
899 || mat & M_LIQUID 925 || mat & M_LIQUID
900 || (mat & M_IRON && rndm (1, 5) == 1) 926 || (mat & M_IRON && rndm (1, 5) == 1)
901 || (mat & M_GLASS && rndm (1, 2) == 1) 927 || (mat & M_GLASS && rndm (1, 2) == 1)
902 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 928 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
903 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 929 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
904 || (mat & M_ICE && temp > 32)) 930 //|| (mat & M_ICE && temp > 32)
931 )
905 destroy = 1; 932 destroy = 1;
906 } 933 }
907 934
908 /* adjust overall chance below */ 935 /* adjust overall chance below */
909 if (destroy && rndm (0, 1)) 936 if (destroy && rndm (0, 1))
… …
929 sint64 total_exp = 0; 956 sint64 total_exp = 0;
930 957
931 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 958 for (mapspace *ms = spaces + size (); ms-- > spaces; )
932 for (object *op = ms->bot; op; op = op->above) 959 for (object *op = ms->bot; op; op = op->above)
933 { 960 {
934 if (QUERY_FLAG (op, FLAG_MONSTER)) 961 if (op->flag [FLAG_MONSTER])
935 { 962 {
936 total_exp += op->stats.exp; 963 total_exp += op->stats.exp;
937 monster_cnt++; 964 monster_cnt++;
938 } 965 }
939 966
940 if (QUERY_FLAG (op, FLAG_GENERATOR)) 967 if (op->flag [FLAG_GENERATOR])
941 { 968 {
942 total_exp += op->stats.exp; 969 total_exp += op->stats.exp;
943 970
944 if (archetype *at = op->other_arch) 971 if (archetype *at = op->other_arch)
945 { 972 {
… …
1127 */ 1154 */
1128 1155
1129 for (object *tmp = last; tmp; tmp = tmp->below) 1156 for (object *tmp = last; tmp; tmp = tmp->below)
1130 { 1157 {
1131 /* Once we get to a floor, stop, since we already have a floor object */ 1158 /* Once we get to a floor, stop, since we already have a floor object */
1132 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1159 if (tmp->flag [FLAG_IS_FLOOR])
1133 break; 1160 break;
1134 1161
1135 /* If two top faces are already set, quit processing */ 1162 /* If two top faces are already set, quit processing */
1136 if (top && middle) 1163 if (top && middle)
1137 break; 1164 break;
… …
1168 middle = 0; 1195 middle = 0;
1169 1196
1170 if (top == middle) 1197 if (top == middle)
1171 middle = 0; 1198 middle = 0;
1172 1199
1200 // set lower map transparent floor flag if applicable
1201 if (floor && floor->flag [FLAG_IS_TRANSPARENT_FLOOR] && !middle && !top)
1202 {
1203 floor->set_anim_frame (0);
1204
1205 if (maptile *m = floor->map->tile_map [TILE_DOWN])
1206 {
1207 mapspace &ms = m->at (floor->x, floor->y);
1208 ms.update ();
1209
1210 if (object *floor2 = ms.faces_obj [2])
1211 if (!floor2->flag [FLAG_IS_TRANSPARENT_FLOOR])
1212 {
1213 floor->set_anim_frame (1);
1214 top = floor;
1215 middle = ms.faces_obj [0];
1216 floor = floor2;
1217 }
1218
1219 ms.pflags |= PF_VIS_UP;
1220 }
1221 }
1222
1173#if 0 1223#if 0
1174 faces_obj [0] = top; 1224 faces_obj [0] = top;
1175 faces_obj [1] = middle; 1225 faces_obj [1] = middle;
1176 faces_obj [2] = floor; 1226 faces_obj [2] = floor;
1177#endif 1227#endif
1178} 1228}
1179 1229
1230void
1231mapspace::update_up ()
1232{
1233 // invalidate up
1234 if (!(pflags & PF_VIS_UP))
1235 return;
1236
1237 pflags &= ~PF_VIS_UP;
1238
1239 if (bot)
1240 if (maptile *m = bot->map->tile_map [TILE_UP])
1241 m->at (bot->x, bot->y).invalidate ();
1242}
1243
1180maptile * 1244maptile *
1181maptile::tile_available (int dir, bool load) 1245maptile::tile_available (int dir, bool load)
1182{ 1246{
1247 // map is there and we don't need to load it OR it's loaded => return what we have
1248 if (tile_map [dir] && (!load || tile_map [dir]->linkable ()))
1249 return tile_map [dir];
1250
1183 if (tile_path[dir]) 1251 if (tile_path [dir])
1184 { 1252 {
1185 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1253 // well, try to locate it then, if possible - maybe it's there already
1254 // this is the ONLY place in the server that links maps with each other,
1255 // so any kind of inter-map stuff has to be initiated here.
1256 if (maptile *m = find_async (tile_path [dir], this, load))
1257 {
1258 bool mismatch = false;
1259
1260 if (dir == TILE_NORTH || dir == TILE_SOUTH || dir == TILE_UP || dir == TILE_DOWN)
1261 if (width != m->width)
1262 mismatch = true;
1263
1264 if (dir == TILE_EAST || dir == TILE_WEST || dir == TILE_UP || dir == TILE_DOWN)
1265 if (height != m->height)
1266 mismatch = true;
1267
1268 if (mismatch)
1269 {
1270 LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
1271 dir, &path, &m->path);
1272 m = 0;
1273 }
1274 else if (0)//D
1275 {
1276 // as an optimisation, link us against the other map if the other map
1277 // has us as neighbour, which is very common, but not guaranteed.
1278 int dir2 = REVERSE_TILE_DIR (dir);
1279
1280 if (m->tile_path [dir2] == path)
1281 m->tile_map [dir2] = this;
1282 }
1283
1284
1186 return tile_map[dir]; 1285 return tile_map [dir] = m;
1187 1286 }
1188 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1189 return tile_map[dir];
1190 } 1287 }
1191 1288
1192 return 0; 1289 return 0;
1193} 1290}
1194 1291
… …
1210 if (!m) 1307 if (!m)
1211 return 0; 1308 return 0;
1212 1309
1213 if (x < 0) 1310 if (x < 0)
1214 { 1311 {
1215 if (!m->tile_available (3)) 1312 if (!m->tile_available (TILE_WEST))
1216 return 1; 1313 return 1;
1217 1314
1218 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1315 return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1219 } 1316 }
1220 1317
1221 if (x >= m->width) 1318 if (x >= m->width)
1222 { 1319 {
1223 if (!m->tile_available (1)) 1320 if (!m->tile_available (TILE_EAST))
1224 return 1; 1321 return 1;
1225 1322
1226 return out_of_map (m->tile_map[1], x - m->width, y); 1323 return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1227 } 1324 }
1228 1325
1229 if (y < 0) 1326 if (y < 0)
1230 { 1327 {
1231 if (!m->tile_available (0)) 1328 if (!m->tile_available (TILE_NORTH))
1232 return 1; 1329 return 1;
1233 1330
1234 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1331 return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1235 } 1332 }
1236 1333
1237 if (y >= m->height) 1334 if (y >= m->height)
1238 { 1335 {
1239 if (!m->tile_available (2)) 1336 if (!m->tile_available (TILE_SOUTH))
1240 return 1; 1337 return 1;
1241 1338
1242 return out_of_map (m->tile_map[2], x, y - m->height); 1339 return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1243 } 1340 }
1244 1341
1245 /* Simple case - coordinates are within this local 1342 /* Simple case - coordinates are within this local
1246 * map. 1343 * map.
1247 */ 1344 */
… …
1259maptile * 1356maptile *
1260maptile::xy_find (sint16 &x, sint16 &y) 1357maptile::xy_find (sint16 &x, sint16 &y)
1261{ 1358{
1262 if (x < 0) 1359 if (x < 0)
1263 { 1360 {
1264 if (!tile_available (3)) 1361 if (!tile_available (TILE_WEST))
1265 return 0; 1362 return 0;
1266 1363
1267 x += tile_map[3]->width; 1364 x += tile_map [TILE_WEST]->width;
1268 return tile_map[3]->xy_find (x, y); 1365 return tile_map [TILE_WEST]->xy_find (x, y);
1269 } 1366 }
1270 1367
1271 if (x >= width) 1368 if (x >= width)
1272 { 1369 {
1273 if (!tile_available (1)) 1370 if (!tile_available (TILE_EAST))
1274 return 0; 1371 return 0;
1275 1372
1276 x -= width; 1373 x -= width;
1277 return tile_map[1]->xy_find (x, y); 1374 return tile_map [TILE_EAST]->xy_find (x, y);
1278 } 1375 }
1279 1376
1280 if (y < 0) 1377 if (y < 0)
1281 { 1378 {
1282 if (!tile_available (0)) 1379 if (!tile_available (TILE_NORTH))
1283 return 0; 1380 return 0;
1284 1381
1285 y += tile_map[0]->height; 1382 y += tile_map [TILE_NORTH]->height;
1286 return tile_map[0]->xy_find (x, y); 1383 return tile_map [TILE_NORTH]->xy_find (x, y);
1287 } 1384 }
1288 1385
1289 if (y >= height) 1386 if (y >= height)
1290 { 1387 {
1291 if (!tile_available (2)) 1388 if (!tile_available (TILE_SOUTH))
1292 return 0; 1389 return 0;
1293 1390
1294 y -= height; 1391 y -= height;
1295 return tile_map[2]->xy_find (x, y); 1392 return tile_map [TILE_SOUTH]->xy_find (x, y);
1296 } 1393 }
1297 1394
1298 /* Simple case - coordinates are within this local 1395 /* Simple case - coordinates are within this local
1299 * map. 1396 * map.
1300 */ 1397 */
… …
1304/** 1401/**
1305 * Return whether map2 is adjacent to map1. If so, store the distance from 1402 * Return whether map2 is adjacent to map1. If so, store the distance from
1306 * map1 to map2 in dx/dy. 1403 * map1 to map2 in dx/dy.
1307 */ 1404 */
1308int 1405int
1309adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1406adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1310{ 1407{
1311 if (!map1 || !map2) 1408 if (!map1 || !map2)
1312 return 0; 1409 return 0;
1313 1410
1314 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1411 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1316 if (map1 == map2) 1413 if (map1 == map2)
1317 { 1414 {
1318 *dx = 0; 1415 *dx = 0;
1319 *dy = 0; 1416 *dy = 0;
1320 } 1417 }
1321 else if (map1->tile_map[0] == map2) 1418 else if (map1->tile_available (TILE_NORTH, false) == map2)
1322 { /* up */ 1419 {
1323 *dx = 0; 1420 *dx = 0;
1324 *dy = -map2->height; 1421 *dy = -map2->height;
1325 } 1422 }
1326 else if (map1->tile_map[1] == map2) 1423 else if (map1->tile_available (TILE_EAST , false) == map2)
1327 { /* right */ 1424 {
1328 *dx = map1->width; 1425 *dx = map1->width;
1329 *dy = 0; 1426 *dy = 0;
1330 } 1427 }
1331 else if (map1->tile_map[2] == map2) 1428 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1332 { /* down */ 1429 {
1333 *dx = 0; 1430 *dx = 0;
1334 *dy = map1->height; 1431 *dy = map1->height;
1335 } 1432 }
1336 else if (map1->tile_map[3] == map2) 1433 else if (map1->tile_available (TILE_WEST , false) == map2)
1337 { /* left */ 1434 {
1338 *dx = -map2->width; 1435 *dx = -map2->width;
1339 *dy = 0; 1436 *dy = 0;
1340 } 1437 }
1341 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1438 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1342 { /* up right */ 1439 { /* up right */
1343 *dx = map1->tile_map[0]->width; 1440 *dx = +map1->tile_map[TILE_NORTH]->width;
1344 *dy = -map1->tile_map[0]->height; 1441 *dy = -map1->tile_map[TILE_NORTH]->height;
1345 } 1442 }
1346 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1443 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1347 { /* up left */ 1444 { /* up left */
1348 *dx = -map2->width; 1445 *dx = -map2->width;
1349 *dy = -map1->tile_map[0]->height; 1446 *dy = -map1->tile_map[TILE_NORTH]->height;
1350 } 1447 }
1351 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1448 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1352 { /* right up */ 1449 { /* right up */
1353 *dx = map1->width; 1450 *dx = +map1->width;
1354 *dy = -map2->height; 1451 *dy = -map2->height;
1355 } 1452 }
1356 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1453 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1357 { /* right down */ 1454 { /* right down */
1358 *dx = map1->width; 1455 *dx = +map1->width;
1359 *dy = map1->tile_map[1]->height; 1456 *dy = +map1->tile_map[TILE_EAST]->height;
1360 } 1457 }
1361 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1458 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1362 { /* down right */ 1459 { /* down right */
1363 *dx = map1->tile_map[2]->width; 1460 *dx = +map1->tile_map[TILE_SOUTH]->width;
1364 *dy = map1->height; 1461 *dy = +map1->height;
1365 } 1462 }
1366 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1463 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1367 { /* down left */ 1464 { /* down left */
1368 *dx = -map2->width; 1465 *dx = -map2->width;
1369 *dy = map1->height; 1466 *dy = +map1->height;
1370 } 1467 }
1371 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1468 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1372 { /* left up */ 1469 { /* left up */
1373 *dx = -map1->tile_map[3]->width; 1470 *dx = -map1->tile_map[TILE_WEST]->width;
1374 *dy = -map2->height; 1471 *dy = -map2->height;
1375 } 1472 }
1376 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1473 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1377 { /* left down */ 1474 { /* left down */
1378 *dx = -map1->tile_map[3]->width; 1475 *dx = -map1->tile_map[TILE_WEST]->width;
1379 *dy = map1->tile_map[3]->height; 1476 *dy = +map1->tile_map[TILE_WEST]->height;
1380 } 1477 }
1381 else 1478 else
1382 return 0; 1479 return 0;
1383 1480
1384 return 1; 1481 return 1;
… …
1420 * 1517 *
1421 * currently, the only flag supported (0x1) is don't translate for 1518 * currently, the only flag supported (0x1) is don't translate for
1422 * closest body part of 'op1' 1519 * closest body part of 'op1'
1423 */ 1520 */
1424void 1521void
1425get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1522get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1426{ 1523{
1427 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1524 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1428 { 1525 {
1429 /* be conservative and fill in _some_ data */ 1526 /* be conservative and fill in _some_ data */
1430 retval->distance = 10000; 1527 retval->distance = 10000;
1431 retval->distance_x = 10000; 1528 retval->distance_x = 10000;
1432 retval->distance_y = 10000; 1529 retval->distance_y = 10000;
1433 retval->direction = 0; 1530 retval->direction = 0;
1434 retval->part = 0; 1531 retval->part = 0;
1435 } 1532 }
1436 else 1533 else
1437 { 1534 {
1438 object *best;
1439
1440 retval->distance_x += op2->x - op1->x; 1535 retval->distance_x += op2->x - op1->x;
1441 retval->distance_y += op2->y - op1->y; 1536 retval->distance_y += op2->y - op1->y;
1442 1537
1443 best = op1; 1538 object *best = op1;
1539
1444 /* If this is multipart, find the closest part now */ 1540 /* If this is multipart, find the closest part now */
1445 if (!(flags & 0x1) && op1->more) 1541 if (!(flags & 1) && op1->more)
1446 { 1542 {
1447 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1543 int best_distance = idistance (retval->distance_x, retval->distance_y);
1448 1544
1449 /* we just take the offset of the piece to head to figure 1545 /* we just take the offset of the piece to head to figure
1450 * distance instead of doing all that work above again 1546 * distance instead of doing all that work above again
1451 * since the distance fields we set above are positive in the 1547 * since the distance fields we set above are positive in the
1452 * same axis as is used for multipart objects, the simply arithmetic 1548 * same axis as is used for multipart objects, the simply arithmetic
1453 * below works. 1549 * below works.
1454 */ 1550 */
1455 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1551 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1456 { 1552 {
1457 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1553 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1458 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1554
1459 if (tmpi < best_distance) 1555 if (tmpi < best_distance)
1460 { 1556 {
1461 best_distance = tmpi; 1557 best_distance = tmpi;
1462 best = tmp; 1558 best = tmp;
1463 } 1559 }
1464 } 1560 }
1465 1561
1466 if (best != op1) 1562 if (best != op1)
1467 { 1563 {
1468 retval->distance_x += op1->x - best->x; 1564 retval->distance_x += op1->x - best->x;
1469 retval->distance_y += op1->y - best->y; 1565 retval->distance_y += op1->y - best->y;
1470 } 1566 }
1471 } 1567 }
1472 1568
1473 retval->part = best; 1569 retval->part = best;
1474 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1570 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1475 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1571 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1476 } 1572 }
1477} 1573}
1478 1574
1479/* this is basically the same as get_rangevector above, but instead of 1575/* this is basically the same as get_rangevector above, but instead of
1480 * the first parameter being an object, it instead is the map 1576 * the first parameter being an object, it instead is the map
… …
1485 * be more consistant with the above function and also in case they are needed 1581 * be more consistant with the above function and also in case they are needed
1486 * for something in the future. Also, since no object is pasted, the best 1582 * for something in the future. Also, since no object is pasted, the best
1487 * field of the rv_vector is set to NULL. 1583 * field of the rv_vector is set to NULL.
1488 */ 1584 */
1489void 1585void
1490get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1586get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1491{ 1587{
1492 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1588 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1493 { 1589 {
1494 /* be conservative and fill in _some_ data */ 1590 /* be conservative and fill in _some_ data */
1495 retval->distance = 100000; 1591 retval->distance = 100000;
1496 retval->distance_x = 32767; 1592 retval->distance_x = 32767;
1497 retval->distance_y = 32767; 1593 retval->distance_y = 32767;
1498 retval->direction = 0; 1594 retval->direction = 0;
1499 retval->part = 0; 1595 retval->part = 0;
1500 } 1596 }
1501 else 1597 else
1502 { 1598 {
1503 retval->distance_x += op2->x - x; 1599 retval->distance_x += op2->x - x;
1504 retval->distance_y += op2->y - y; 1600 retval->distance_y += op2->y - y;
1505 1601
1506 retval->part = 0; 1602 retval->part = 0;
1507 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1603 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1508 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1604 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1509 } 1605 }
1510} 1606}
1511 1607
1512/* Returns true of op1 and op2 are effectively on the same map 1608/* Returns true of op1 and op2 are effectively on the same map
1513 * (as related to map tiling). Note that this looks for a path from 1609 * (as related to map tiling). Note that this looks for a path from
… …
1563 */ 1659 */
1564 for (int i = 1000; --i;) 1660 for (int i = 1000; --i;)
1565 { 1661 {
1566 object *pick = at (gen (width), gen (height)).bot; 1662 object *pick = at (gen (width), gen (height)).bot;
1567 1663
1568 // do not prefer big monsters just because they are big. 1664 // must be head: do not prefer big monsters just because they are big.
1569 if (pick && pick->is_head ()) 1665 if (pick && pick->is_head ())
1570 return pick->head_ (); 1666 return pick;
1571 } 1667 }
1572 1668
1573 // instead of crashing in the unlikely(?) case, try to return *something* 1669 // instead of crashing in the unlikely(?) case, try to return *something*
1574 return archetype::find (shstr_bug); 1670 return archetype::find (shstr_bug);
1575} 1671}
… …
1609 if (distance <= MAX_SOUND_DISTANCE) 1705 if (distance <= MAX_SOUND_DISTANCE)
1610 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg); 1706 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1611 } 1707 }
1612} 1708}
1613 1709
1710dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1711
1614static void 1712static void
1615split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1713split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1616{ 1714{
1617 // clip to map to the left 1715 // clip to map to the left
1618 if (x0 < 0) 1716 if (x0 < 0)
1619 { 1717 {
1620 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1718 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1621 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy); 1719 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1622 1720
1623 if (x1 < 0) // entirely to the left 1721 if (x1 < 0) // entirely to the left
1624 return; 1722 return;
1625 1723
… …
1627 } 1725 }
1628 1726
1629 // clip to map to the right 1727 // clip to map to the right
1630 if (x1 > m->width) 1728 if (x1 > m->width)
1631 { 1729 {
1632 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1730 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1633 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy); 1731 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1634 1732
1635 if (x0 > m->width) // entirely to the right 1733 if (x0 >= m->width) // entirely to the right
1636 return; 1734 return;
1637 1735
1638 x1 = m->width; 1736 x1 = m->width;
1639 } 1737 }
1640 1738
1641 // clip to map above 1739 // clip to map to the north
1642 if (y0 < 0) 1740 if (y0 < 0)
1643 { 1741 {
1644 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1742 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1645 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height); 1743 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1646 1744
1647 if (y1 < 0) // entirely above 1745 if (y1 < 0) // entirely to the north
1648 return; 1746 return;
1649 1747
1650 y0 = 0; 1748 y0 = 0;
1651 } 1749 }
1652 1750
1653 // clip to map below 1751 // clip to map to the south
1654 if (y1 > m->height) 1752 if (y1 > m->height)
1655 { 1753 {
1656 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1754 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1657 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height); 1755 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1658 1756
1659 if (y0 > m->height) // entirely below 1757 if (y0 >= m->height) // entirely to the south
1660 return; 1758 return;
1661 1759
1662 y1 = m->height; 1760 y1 = m->height;
1663 } 1761 }
1664 1762
… …
1673 r->dx = dx; 1771 r->dx = dx;
1674 r->dy = dy; 1772 r->dy = dy;
1675} 1773}
1676 1774
1677maprect * 1775maprect *
1678maptile::split_to_tiles (int x0, int y0, int x1, int y1) 1776maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1679{ 1777{
1680 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1681 buf.clear (); 1778 buf.clear ();
1682 1779
1683 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0); 1780 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1684 1781
1685 // add end marker 1782 // add end marker

Diff Legend

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