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.129 by root, Wed Sep 12 11:10:09 2007 UTC vs.
Revision 1.164 by root, Fri Oct 16 01:19:12 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <unistd.h> 25#include <unistd.h>
25 26
26#include "global.h" 27#include "global.h"
27#include "funcpoint.h"
28
29#include "loader.h" 28#include "loader.h"
30
31#include "path.h" 29#include "path.h"
30
31sint8 maptile::outdoor_darkness;
32 32
33/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
35 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
36 * new values into newmap, nx, and ny. Any and all of those 36 * new values into newmap, nx, and ny. Any and all of those
71 * by the caller. 71 * by the caller.
72 */ 72 */
73int 73int
74blocked_link (object *ob, maptile *m, int sx, int sy) 74blocked_link (object *ob, maptile *m, int sx, int sy)
75{ 75{
76 object *tmp;
77 int mflags, blocked;
78
79 /* Make sure the coordinates are valid - they should be, as caller should 76 /* Make sure the coordinates are valid - they should be, as caller should
80 * have already checked this. 77 * have already checked this.
81 */ 78 */
82 if (OUT_OF_REAL_MAP (m, sx, sy)) 79 if (OUT_OF_REAL_MAP (m, sx, sy))
83 { 80 {
86 } 83 }
87 84
88 /* Save some cycles - instead of calling get_map_flags(), just get the value 85 /* Save some cycles - instead of calling get_map_flags(), just get the value
89 * directly. 86 * directly.
90 */ 87 */
91 mflags = m->at (sx, sy).flags (); 88 mapspace &ms = m->at (sx, sy);
92 89
93 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 90 int mflags = ms.flags ();
91 int blocked = ms.move_block;
94 92
95 /* If space is currently not blocked by anything, no need to 93 /* If space is currently not blocked by anything, no need to
96 * go further. Not true for players - all sorts of special 94 * go further. Not true for players - all sorts of special
97 * things we need to do for players. 95 * things we need to do for players.
98 */ 96 */
99 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 97 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
100 return 0; 98 return 0;
101 99
102 /* if there isn't anytyhing alive on this space, and this space isn't 100 /* if there isn't anything alive on this space, and this space isn't
103 * otherwise blocked, we can return now. Only if there is a living 101 * otherwise blocked, we can return now. Only if there is a living
104 * creature do we need to investigate if it is part of this creature 102 * creature do we need to investigate if it is part of this creature
105 * or another. Likewise, only if something is blocking us do we 103 * or another. Likewise, only if something is blocking us do we
106 * need to investigate if there is a special circumstance that would 104 * need to investigate if there is a special circumstance that would
107 * let the player through (inventory checkers for example) 105 * let the player through (inventory checkers for example)
114 /* We basically go through the stack of objects, and if there is 112 /* We basically go through the stack of objects, and if there is
115 * some other object that has NO_PASS or FLAG_ALIVE set, return 113 * some other object that has NO_PASS or FLAG_ALIVE set, return
116 * true. If we get through the entire stack, that must mean 114 * true. If we get through the entire stack, that must mean
117 * ob is blocking it, so return 0. 115 * ob is blocking it, so return 0.
118 */ 116 */
119 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 117 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
120 { 118 {
119 bool block = OB_MOVE_BLOCK (ob, tmp);
121 120
122 /* This must be before the checks below. Code for inventory checkers. */ 121 /* This must be before the checks below. Code for inventory checkers. */
123 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 122 if (block && tmp->type == CHECK_INV)
124 { 123 {
124 bool have = check_inv_recursive (ob, tmp);
125
125 /* If last_sp is set, the player/monster needs an object, 126 /* If last_sp is set, the player/monster needs an object,
126 * so we check for it. If they don't have it, they can't 127 * so we check for it. If they don't have it, they can't
127 * pass through this space. 128 * pass through this space.
128 */ 129 */
129 if (tmp->last_sp) 130 if (tmp->last_sp)
130 { 131 {
131 if (check_inv_recursive (ob, tmp) == NULL) 132 if (!have)
132 return 1; 133 return 1;
133 else
134 continue;
135 } 134 }
136 else 135 else
137 { 136 {
138 /* In this case, the player must not have the object - 137 /* In this case, the player must not have the object -
139 * if they do, they can't pass through. 138 * if they do, they can't pass through.
140 */ 139 */
141 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */ 140 if (have)
142 return 1; 141 return 1;
143 else
144 continue;
145 } 142 }
146 } /* if check_inv */ 143 }
144 else if (block && tmp->type == T_MATCH)
145 {
146 //TODO
147 }
147 else 148 else
148 { 149 {
149 /* Broke apart a big nasty if into several here to make 150 /* Broke apart a big nasty if into several here to make
150 * this more readable. first check - if the space blocks 151 * this more readable. first check - if the space blocks
151 * movement, can't move here. 152 * movement, can't move here.
152 * second - if a monster, can't move there, unless it is a 153 * second - if a monster, can't move there, unless it is a
153 * hidden dm 154 * dm.
154 */ 155 */
155 if (OB_MOVE_BLOCK (ob, tmp)) 156 if (block)
156 return 1; 157 return 1;
157 158
158 if (tmp->flag [FLAG_ALIVE] 159 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob 160 && tmp->head_ () != ob
160 && tmp != ob 161 && tmp != ob
161 && tmp->type != DOOR 162 && tmp->type != DOOR
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 163 && !tmp->flag [FLAG_WIZ])
163 return 1; 164 return 1;
164 } 165 }
165
166 } 166 }
167
167 return 0; 168 return 0;
168} 169}
169 170
170/* 171/*
171 * Returns qthe blocking object if the given object can't fit in the given 172 * Returns qthe blocking object if the given object can't fit in the given
245 246
246 insert_ob_in_ob (tmp, container); 247 insert_ob_in_ob (tmp, container);
247 tmp = next; 248 tmp = next;
248 } 249 }
249 250
250 /* sum_weight will go through and calculate what all the containers are 251 // go through and calculate what all the containers are carrying.
251 * carrying. 252 //TODO: remove
252 */ 253 container->update_weight ();
253 sum_weight (container);
254} 254}
255 255
256void 256void
257maptile::set_object_flag (int flag, int value) 257maptile::set_object_flag (int flag, int value)
258{ 258{
260 return; 260 return;
261 261
262 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 262 for (mapspace *ms = spaces + size (); ms-- > spaces; )
263 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 263 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
264 tmp->flag [flag] = value; 264 tmp->flag [flag] = value;
265}
266
267void
268maptile::post_load_original ()
269{
270 if (!spaces)
271 return;
272
273 set_object_flag (FLAG_OBJ_ORIGINAL);
274
275 for (mapspace *ms = spaces + size (); ms-- > spaces; )
276 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
277 INVOKE_OBJECT (RESET, tmp);
265} 278}
266 279
267/* link_multipart_objects go through all the objects on the map looking 280/* link_multipart_objects go through all the objects on the map looking
268 * for objects whose arch says they are multipart yet according to the 281 * for objects whose arch says they are multipart yet according to the
269 * info we have, they only have the head (as would be expected when 282 * info we have, they only have the head (as would be expected when
307bool 320bool
308maptile::_load_objects (object_thawer &f) 321maptile::_load_objects (object_thawer &f)
309{ 322{
310 for (;;) 323 for (;;)
311 { 324 {
312 coroapi::cede_to_tick_every (100); // cede once in a while 325 coroapi::cede_to_tick (); // cede once in a while
313 326
314 switch (f.kw) 327 switch (f.kw)
315 { 328 {
316 case KW_arch: 329 case KW_arch:
317 if (object *op = object::read (f, this)) 330 if (object *op = object::read (f, this))
318 { 331 {
332 // TODO: why?
319 if (op->inv) 333 if (op->inv)
320 sum_weight (op); 334 op->update_weight ();
321 335
322 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 336 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
337 {
338 // we insert manually because
339 // a) its way faster
340 // b) we remove manually, too, and there are good reasons for that
341 // c) it's correct
342 mapspace &ms = at (op->x, op->y);
343
344 op->flag [FLAG_REMOVED] = false;
345
346 op->above = 0;
347 op->below = ms.top;
348
349 *(ms.top ? &ms.top->above : &ms.bot) = op;
350
351 ms.top = op;
352 ms.flags_ = 0;
353 }
354 else
355 {
356 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
357 op->destroy ();
358 }
323 } 359 }
324 360
325 continue; 361 continue;
326 362
327 case KW_EOF: 363 case KW_EOF:
530 return items; 566 return items;
531} 567}
532 568
533/* opposite of parse string, this puts the string that was originally fed in to 569/* opposite of parse string, this puts the string that was originally fed in to
534 * the map (or something equivilent) into output_string. */ 570 * the map (or something equivilent) into output_string. */
535static void 571static const char *
536print_shop_string (maptile *m, char *output_string) 572print_shop_string (maptile *m)
537{ 573{
538 int i; 574 static dynbuf_text buf; buf.clear ();
539 char tmp[MAX_BUF];
540 575
541 strcpy (output_string, "");
542 for (i = 0; i < m->shopitems[0].index; i++) 576 for (int i = 0; i < m->shopitems[0].index; i++)
543 { 577 {
544 if (m->shopitems[i].typenum) 578 if (m->shopitems[i].typenum)
545 { 579 {
546 if (m->shopitems[i].strength) 580 if (m->shopitems[i].strength)
547 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 581 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
548 else 582 else
549 sprintf (tmp, "%s;", m->shopitems[i].name); 583 buf.printf ("%s;", m->shopitems[i].name);
550 } 584 }
551 else 585 else
552 { 586 {
553 if (m->shopitems[i].strength) 587 if (m->shopitems[i].strength)
554 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 588 buf.printf ("*:%d;", m->shopitems[i].strength);
555 else 589 else
556 sprintf (tmp, "*"); 590 buf.printf ("*");
557 } 591 }
558
559 strcat (output_string, tmp);
560 } 592 }
593
594 return buf;
561} 595}
562 596
563/* This loads the header information of the map. The header 597/* This loads the header information of the map. The header
564 * contains things like difficulty, size, timeout, etc. 598 * contains things like difficulty, size, timeout, etc.
565 * this used to be stored in the map object, but with the 599 * this used to be stored in the map object, but with the
617 case KW_sky: thawer.get (sky); break; 651 case KW_sky: thawer.get (sky); break;
618 652
619 case KW_per_player: thawer.get (per_player); break; 653 case KW_per_player: thawer.get (per_player); break;
620 case KW_per_party: thawer.get (per_party); break; 654 case KW_per_party: thawer.get (per_party); break;
621 case KW_no_reset: thawer.get (no_reset); break; 655 case KW_no_reset: thawer.get (no_reset); break;
656 case KW_no_drop: thawer.get (no_drop); break;
622 657
623 case KW_region: default_region = region::find (thawer.get_str ()); break; 658 case KW_region: default_region = region::find (thawer.get_str ()); break;
624 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 659 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
625 660
626 // old names new names 661 // old names new names
676 711
677 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 712 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
678 unique = 1; 713 unique = 1;
679 714
680 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 715 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
681 {
682 op->destroy_inv (false);
683 op->destroy (); 716 op->destroy ();
684 }
685 717
686 op = above; 718 op = above;
687 } 719 }
688 } 720 }
689} 721}
700 MAP_OUT (swap_time); 732 MAP_OUT (swap_time);
701 MAP_OUT (reset_time); 733 MAP_OUT (reset_time);
702 MAP_OUT (reset_timeout); 734 MAP_OUT (reset_timeout);
703 MAP_OUT (fixed_resettime); 735 MAP_OUT (fixed_resettime);
704 MAP_OUT (no_reset); 736 MAP_OUT (no_reset);
737 MAP_OUT (no_drop);
705 MAP_OUT (difficulty); 738 MAP_OUT (difficulty);
706
707 if (default_region) MAP_OUT2 (region, default_region->name); 739 if (default_region) MAP_OUT2 (region, default_region->name);
708 740
709 if (shopitems) 741 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
710 {
711 char shop[MAX_BUF];
712 print_shop_string (this, shop);
713 MAP_OUT2 (shopitems, shop);
714 }
715
716 MAP_OUT (shopgreed); 742 MAP_OUT (shopgreed);
717 MAP_OUT (shopmin); 743 MAP_OUT (shopmin);
718 MAP_OUT (shopmax); 744 MAP_OUT (shopmax);
719 if (shoprace) MAP_OUT (shoprace); 745 if (shoprace) MAP_OUT (shoprace);
746
720 MAP_OUT (darkness); 747 MAP_OUT (darkness);
721 MAP_OUT (width); 748 MAP_OUT (width);
722 MAP_OUT (height); 749 MAP_OUT (height);
723 MAP_OUT (enter_x); 750 MAP_OUT (enter_x);
724 MAP_OUT (enter_y); 751 MAP_OUT (enter_y);
776 803
777 op->flag [FLAG_REMOVED] = true; 804 op->flag [FLAG_REMOVED] = true;
778 805
779 object *head = op->head_ (); 806 object *head = op->head_ ();
780 if (op == head) 807 if (op == head)
781 {
782 op->destroy_inv (false);
783 op->destroy (); 808 op->destroy ();
784 }
785 else if (head->map != op->map) 809 else if (head->map != op->map)
786 { 810 {
787 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); 811 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
788 head->destroy (); 812 head->destroy ();
789 } 813 }
790 } 814 }
791 815
792 sfree (spaces, size ()), spaces = 0; 816 sfree0 (spaces, size ());
793 } 817 }
794 818
795 if (buttons) 819 if (buttons)
796 free_objectlinkpt (buttons), buttons = 0; 820 free_objectlinkpt (buttons), buttons = 0;
797 821
798 sfree (regions, size ()); regions = 0; 822 sfree0 (regions, size ());
799 delete [] regionmap; regionmap = 0; 823 delete [] regionmap; regionmap = 0;
800} 824}
801 825
802void 826void
803maptile::clear_header () 827maptile::clear_header ()
904 op->destroy (); 928 op->destroy ();
905 } 929 }
906} 930}
907 931
908/* 932/*
909 * Updates every button on the map (by calling update_button() for them).
910 */
911void
912maptile::update_buttons ()
913{
914 for (oblinkpt *obp = buttons; obp; obp = obp->next)
915 for (objectlink *ol = obp->link; ol; ol = ol->next)
916 {
917 if (!ol->ob)
918 {
919 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
920 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
921 continue;
922 }
923
924 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
925 {
926 update_button (ol->ob);
927 break;
928 }
929 }
930}
931
932/*
933 * This routine is supposed to find out the difficulty of the map. 933 * This routine is supposed to find out the difficulty of the map.
934 * difficulty does not have a lot to do with character level, 934 * difficulty does not have a lot to do with character level,
935 * but does have a lot to do with treasure on the map. 935 * but does have a lot to do with treasure on the map.
936 * 936 *
937 * Difficulty can now be set by the map creature. If the value stored 937 * Difficulty can now be set by the map creator. If the value stored
938 * in the map is zero, then use this routine. Maps should really 938 * in the map is zero, then use this routine. Maps should really
939 * have a difficulty set than using this function - human calculation 939 * have a difficulty set rather than using this function - human calculation
940 * is much better than this functions guesswork. 940 * is much better than this function's guesswork.
941 */ 941 */
942int 942int
943maptile::estimate_difficulty () const 943maptile::estimate_difficulty () const
944{ 944{
945 long monster_cnt = 0; 945 long monster_cnt = 0;
957 957
958 if (QUERY_FLAG (op, FLAG_GENERATOR)) 958 if (QUERY_FLAG (op, FLAG_GENERATOR))
959 { 959 {
960 total_exp += op->stats.exp; 960 total_exp += op->stats.exp;
961 961
962 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 962 if (archetype *at = op->other_arch)
963 {
963 total_exp += at->stats.exp * 8; 964 total_exp += at->stats.exp * 8;
964
965 monster_cnt++; 965 monster_cnt++;
966 }
967
968 for (object *inv = op->inv; inv; inv = inv->below)
969 {
970 total_exp += op->stats.exp * 8;
971 monster_cnt++;
972 }
966 } 973 }
967 } 974 }
968 975
969 avgexp = (double) total_exp / monster_cnt; 976 avgexp = (double) total_exp / monster_cnt;
970 977
983 * postive values make it darker, negative make it brighter 990 * postive values make it darker, negative make it brighter
984 */ 991 */
985int 992int
986maptile::change_map_light (int change) 993maptile::change_map_light (int change)
987{ 994{
988 int new_level = darkness + change;
989
990 /* Nothing to do */ 995 /* Nothing to do */
991 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 996 if (!change)
992 return 0; 997 return 0;
993 998
994 /* inform all players on the map */ 999 /* inform all players on the map */
995 if (change > 0) 1000 if (change > 0)
996 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1001 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
997 else 1002 else
998 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1003 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
999 1004
1000 /* Do extra checking. since darkness is a unsigned value, 1005 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1001 * we need to be extra careful about negative values.
1002 * In general, the checks below are only needed if change
1003 * is not +/-1
1004 */
1005 if (new_level < 0)
1006 darkness = 0;
1007 else if (new_level >= MAX_DARKNESS)
1008 darkness = MAX_DARKNESS;
1009 else
1010 darkness = new_level;
1011 1006
1012 /* All clients need to get re-updated for the change */ 1007 /* All clients need to get re-updated for the change */
1013 update_all_map_los (this); 1008 update_all_map_los (this);
1009
1014 return 1; 1010 return 1;
1015} 1011}
1016 1012
1017/* 1013/*
1018 * This function updates various attributes about a specific space 1014 * This function updates various attributes about a specific space
1021 * through, etc) 1017 * through, etc)
1022 */ 1018 */
1023void 1019void
1024mapspace::update_ () 1020mapspace::update_ ()
1025{ 1021{
1026 object *tmp, *last = 0; 1022 object *last = 0;
1027 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1023 uint8 flags = P_UPTODATE, anywhere = 0;
1024 sint8 light = 0;
1028 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1025 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1029 1026
1030 //object *middle = 0; 1027 //object *middle = 0;
1031 //object *top = 0; 1028 //object *top = 0;
1032 //object *floor = 0; 1029 //object *floor = 0;
1033 // this seems to generate better code than using locals, above 1030 // this seems to generate better code than using locals, above
1034 object *&top = faces_obj[0] = 0; 1031 object *&top = faces_obj[0] = 0;
1035 object *&middle = faces_obj[1] = 0; 1032 object *&middle = faces_obj[1] = 0;
1036 object *&floor = faces_obj[2] = 0; 1033 object *&floor = faces_obj[2] = 0;
1037 1034
1038 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1035 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1039 { 1036 {
1040 /* This could be made additive I guess (two lights better than 1037 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1041 * one). But if so, it shouldn't be a simple additive - 2
1042 * light bulbs do not illuminate twice as far as once since
1043 * it is a dissapation factor that is cubed.
1044 */
1045 if (tmp->glow_radius > light)
1046 light = tmp->glow_radius; 1038 light += tmp->glow_radius;
1047 1039
1048 /* This call is needed in order to update objects the player 1040 /* This call is needed in order to update objects the player
1049 * is standing in that have animations (ie, grass, fire, etc). 1041 * is standing in that have animations (ie, grass, fire, etc).
1050 * However, it also causes the look window to be re-drawn 1042 * However, it also causes the look window to be re-drawn
1051 * 3 times each time the player moves, because many of the 1043 * 3 times each time the player moves, because many of the
1070 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1062 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1071 { 1063 {
1072 middle = tmp; 1064 middle = tmp;
1073 anywhere = 1; 1065 anywhere = 1;
1074 } 1066 }
1067
1075 /* Find the highest visible face around. If equal 1068 /* Find the highest visible face around. If equal
1076 * visibilities, we still want the one nearer to the 1069 * visibilities, we still want the one nearer to the
1077 * top 1070 * top
1078 */ 1071 */
1079 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1072 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1098 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1091 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1099 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1092 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1100 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1093 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1101 } 1094 }
1102 1095
1103 this->light = light; 1096 this->light = min (light, MAX_LIGHT_RADIUS);
1104 this->flags_ = flags; 1097 this->flags_ = flags;
1105 this->move_block = move_block & ~move_allow; 1098 this->move_block = move_block & ~move_allow;
1106 this->move_on = move_on; 1099 this->move_on = move_on;
1107 this->move_off = move_off; 1100 this->move_off = move_off;
1108 this->move_slow = move_slow; 1101 this->move_slow = move_slow;
1128 * 1) top face is set, need middle to be set. 1121 * 1) top face is set, need middle to be set.
1129 * 2) middle is set, need to set top. 1122 * 2) middle is set, need to set top.
1130 * 3) neither middle or top is set - need to set both. 1123 * 3) neither middle or top is set - need to set both.
1131 */ 1124 */
1132 1125
1133 for (tmp = last; tmp; tmp = tmp->below) 1126 for (object *tmp = last; tmp; tmp = tmp->below)
1134 { 1127 {
1135 /* Once we get to a floor, stop, since we already have a floor object */ 1128 /* Once we get to a floor, stop, since we already have a floor object */
1136 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1129 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1137 break; 1130 break;
1138 1131
1190 vol += op->volume (); 1183 vol += op->volume ();
1191 1184
1192 return vol; 1185 return vol;
1193} 1186}
1194 1187
1195bool 1188maptile *
1196maptile::tile_available (int dir, bool load) 1189maptile::tile_available (int dir, bool load)
1197{ 1190{
1198 if (!tile_path[dir]) 1191 if (tile_path[dir])
1199 return 0; 1192 {
1200
1201 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1193 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1202 return 1; 1194 return tile_map[dir];
1203 1195
1204 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1196 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1205 return 1; 1197 return tile_map[dir];
1198 }
1206 1199
1207 return 0; 1200 return 0;
1208} 1201}
1209 1202
1210/* this returns TRUE if the coordinates (x,y) are out of 1203/* this returns TRUE if the coordinates (x,y) are out of
1516 else 1509 else
1517 { 1510 {
1518 retval->distance_x += op2->x - x; 1511 retval->distance_x += op2->x - x;
1519 retval->distance_y += op2->y - y; 1512 retval->distance_y += op2->y - y;
1520 1513
1521 retval->part = NULL; 1514 retval->part = 0;
1522 retval->distance = idistance (retval->distance_x, retval->distance_y); 1515 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1523 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1516 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1524 } 1517 }
1525} 1518}
1526 1519
1527/* Returns true of op1 and op2 are effectively on the same map 1520/* Returns true of op1 and op2 are effectively on the same map
1541} 1534}
1542 1535
1543object * 1536object *
1544maptile::insert (object *op, int x, int y, object *originator, int flags) 1537maptile::insert (object *op, int x, int y, object *originator, int flags)
1545{ 1538{
1546 if (!op->flag [FLAG_REMOVED])
1547 op->remove ();
1548
1549 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1539 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1550} 1540}
1551 1541
1552region * 1542region *
1553maptile::region (int x, int y) const 1543maptile::region (int x, int y) const
1563 1553
1564 return ::region::default_region (); 1554 return ::region::default_region ();
1565} 1555}
1566 1556
1567/* picks a random object from a style map. 1557/* picks a random object from a style map.
1568 * Redone by MSW so it should be faster and not use static
1569 * variables to generate tables.
1570 */ 1558 */
1571object * 1559object *
1572maptile::pick_random_object () const 1560maptile::pick_random_object (rand_gen &gen) const
1573{ 1561{
1574 /* while returning a null object will result in a crash, that 1562 /* while returning a null object will result in a crash, that
1575 * is actually preferable to an infinite loop. That is because 1563 * is actually preferable to an infinite loop. That is because
1576 * most servers will automatically restart in case of crash. 1564 * most servers will automatically restart in case of crash.
1577 * Change the logic on getting the random space - shouldn't make 1565 * Change the logic on getting the random space - shouldn't make
1578 * any difference, but this seems clearer to me. 1566 * any difference, but this seems clearer to me.
1579 */ 1567 */
1580 for (int i = 1000; --i;) 1568 for (int i = 1000; --i;)
1581 { 1569 {
1582 object *pick = at (rndm (width), rndm (height)).bot; 1570 object *pick = at (gen (width), gen (height)).bot;
1583 1571
1584 // do not prefer big monsters just because they are big. 1572 // do not prefer big monsters just because they are big.
1585 if (pick && pick->head_ () == pick) 1573 if (pick && pick->is_head ())
1586 return pick->head_ (); 1574 return pick->head_ ();
1587 } 1575 }
1588 1576
1589 // instead of crashing in the unlikely(?) case, try to return *something* 1577 // instead of crashing in the unlikely(?) case, try to return *something*
1590 return get_archetype ("blocked"); 1578 return archetype::find ("bug");
1591} 1579}
1592 1580
1593void 1581void
1594maptile::play_sound (faceidx sound, int x, int y) const 1582maptile::play_sound (faceidx sound, int x, int y) const
1595{ 1583{
1596 if (!sound) 1584 if (!sound)
1597 return; 1585 return;
1598 1586
1587 for_all_players_on_map (pl, this)
1588 if (client *ns = pl->ns)
1589 {
1590 int dx = x - pl->ob->x;
1591 int dy = y - pl->ob->y;
1592
1593 int distance = idistance (dx, dy);
1594
1595 if (distance <= MAX_SOUND_DISTANCE)
1596 ns->play_sound (sound, dx, dy);
1597 }
1598}
1599
1600void
1601maptile::say_msg (const char *msg, int x, int y) const
1602{
1599 for_all_players (pl) 1603 for_all_players (pl)
1600 if (pl->observe->map == this)
1601 if (client *ns = pl->ns) 1604 if (client *ns = pl->ns)
1602 { 1605 {
1603 int dx = x - pl->observe->x; 1606 int dx = x - pl->ob->x;
1604 int dy = y - pl->observe->y; 1607 int dy = y - pl->ob->y;
1605 1608
1606 int distance = idistance (dx, dy); 1609 int distance = idistance (dx, dy);
1607 1610
1608 if (distance <= MAX_SOUND_DISTANCE) 1611 if (distance <= MAX_SOUND_DISTANCE)
1609 ns->play_sound (sound, dx, dy); 1612 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1610 } 1613 }
1611} 1614}
1612 1615
1616static void
1617split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1618{
1619 // clip to map to the left
1620 if (x0 < 0)
1621 {
1622 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1623 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1624
1625 if (x1 < 0) // entirely to the left
1626 return;
1627
1628 x0 = 0;
1629 }
1630
1631 // clip to map to the right
1632 if (x1 > m->width)
1633 {
1634 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1635 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1636
1637 if (x0 > m->width) // entirely to the right
1638 return;
1639
1640 x1 = m->width;
1641 }
1642
1643 // clip to map above
1644 if (y0 < 0)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_UP, 1))
1647 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1648
1649 if (y1 < 0) // entirely above
1650 return;
1651
1652 y0 = 0;
1653 }
1654
1655 // clip to map below
1656 if (y1 > m->height)
1657 {
1658 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1659 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1660
1661 if (y0 > m->height) // entirely below
1662 return;
1663
1664 y1 = m->height;
1665 }
1666
1667 // if we get here, the rect is within the current map
1668 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1669
1670 r->m = m;
1671 r->x0 = x0;
1672 r->y0 = y0;
1673 r->x1 = x1;
1674 r->y1 = y1;
1675 r->dx = dx;
1676 r->dy = dy;
1677}
1678
1679maprect *
1680maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1681{
1682 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1683 buf.clear ();
1684
1685 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1686
1687 // add end marker
1688 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1689 r->m = 0;
1690
1691 return (maprect *)buf.linearise ();
1692}
1693

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines