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.127 by root, Fri Sep 7 18:03:31 2007 UTC vs.
Revision 1.162 by root, Tue Oct 13 18:22:44 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 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 true if the given object can't fit in the given spot. 172 * Returns qthe blocking object if the given object can't fit in the given
172 * This is meant for multi space objects - for single space objecs, 173 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 174 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 175 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 176 * object and makes sure they can be inserted.
176 * 177 *
177 * While this doesn't call out of map, the get_map_flags does. 178 * While this doesn't call out of map, the get_map_flags does.
178 * 179 *
179 * This function has been used to deprecate arch_out_of_map - 180 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 181 * this function also does that check, and since in most cases,
191 * 192 *
192 * Note this used to be arch_blocked, but with new movement 193 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 194 * code, we need to have actual object to check its move_type
194 * against the move_block values. 195 * against the move_block values.
195 */ 196 */
196int 197bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 198object::blocked (maptile *m, int x, int y) const
198{ 199{
199 archetype *tmp; 200 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
200 int flag;
201 maptile *m1;
202 sint16 sx, sy;
203
204 if (!ob)
205 {
206 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
207 if (flag & P_OUT_OF_MAP)
208 return P_OUT_OF_MAP;
209
210 /* don't have object, so don't know what types would block */
211 return m1->at (sx, sy).move_block;
212 } 201 {
202 mapxy pos (m, x + tmp->x, y + tmp->y);
213 203
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 204 if (!pos.normalise ())
215 { 205 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 206
218 if (flag & P_OUT_OF_MAP) 207 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 208
220 if (flag & P_IS_ALIVE) 209 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 210 return 1;
222 211
223 mapspace &ms = m1->at (sx, sy); 212 /* However, often ob doesn't have any move type
224 213 * (signifying non-moving objects)
225 /* find_first_free_spot() calls this function. However, often
226 * ob doesn't have any move type (when used to place exits)
227 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 214 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 215 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 216 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 217 continue;
232 218
233 /* Note it is intentional that we check ob - the movement type of the 219 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 220 * head of the object should correspond for the entire object.
235 */ 221 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 222 if (ms.blocks (move_type))
237 return P_NO_PASS; 223 return 1;
238 } 224 }
239 225
240 return 0; 226 return 0;
241} 227}
242 228
260 246
261 insert_ob_in_ob (tmp, container); 247 insert_ob_in_ob (tmp, container);
262 tmp = next; 248 tmp = next;
263 } 249 }
264 250
265 /* sum_weight will go through and calculate what all the containers are 251 // go through and calculate what all the containers are carrying.
266 * carrying. 252 //TODO: remove
267 */ 253 container->update_weight ();
268 sum_weight (container);
269} 254}
270 255
271void 256void
272maptile::set_object_flag (int flag, int value) 257maptile::set_object_flag (int flag, int value)
273{ 258{
275 return; 260 return;
276 261
277 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 262 for (mapspace *ms = spaces + size (); ms-- > spaces; )
278 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 263 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
279 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);
280} 278}
281 279
282/* 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
283 * 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
284 * 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
322bool 320bool
323maptile::_load_objects (object_thawer &f) 321maptile::_load_objects (object_thawer &f)
324{ 322{
325 for (;;) 323 for (;;)
326 { 324 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 325 coroapi::cede_to_tick (); // cede once in a while
328 326
329 switch (f.kw) 327 switch (f.kw)
330 { 328 {
331 case KW_arch: 329 case KW_arch:
332 if (object *op = object::read (f, this)) 330 if (object *op = object::read (f, this))
333 { 331 {
332 // TODO: why?
334 if (op->inv) 333 if (op->inv)
335 sum_weight (op); 334 op->update_weight ();
336 335
337 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 }
338 } 359 }
339 360
340 continue; 361 continue;
341 362
342 case KW_EOF: 363 case KW_EOF:
632 case KW_sky: thawer.get (sky); break; 653 case KW_sky: thawer.get (sky); break;
633 654
634 case KW_per_player: thawer.get (per_player); break; 655 case KW_per_player: thawer.get (per_player); break;
635 case KW_per_party: thawer.get (per_party); break; 656 case KW_per_party: thawer.get (per_party); break;
636 case KW_no_reset: thawer.get (no_reset); break; 657 case KW_no_reset: thawer.get (no_reset); break;
658 case KW_no_drop: thawer.get (no_drop); break;
637 659
638 case KW_region: default_region = region::find (thawer.get_str ()); break; 660 case KW_region: default_region = region::find (thawer.get_str ()); break;
639 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 661 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
640 662
641 // old names new names 663 // old names new names
691 713
692 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 714 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
693 unique = 1; 715 unique = 1;
694 716
695 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 717 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
696 {
697 op->destroy_inv (false);
698 op->destroy (); 718 op->destroy ();
699 }
700 719
701 op = above; 720 op = above;
702 } 721 }
703 } 722 }
704} 723}
715 MAP_OUT (swap_time); 734 MAP_OUT (swap_time);
716 MAP_OUT (reset_time); 735 MAP_OUT (reset_time);
717 MAP_OUT (reset_timeout); 736 MAP_OUT (reset_timeout);
718 MAP_OUT (fixed_resettime); 737 MAP_OUT (fixed_resettime);
719 MAP_OUT (no_reset); 738 MAP_OUT (no_reset);
739 MAP_OUT (no_drop);
720 MAP_OUT (difficulty); 740 MAP_OUT (difficulty);
721 741
722 if (default_region) MAP_OUT2 (region, default_region->name); 742 if (default_region) MAP_OUT2 (region, default_region->name);
723 743
724 if (shopitems) 744 if (shopitems)
789 if (ms->bot = op->above) 809 if (ms->bot = op->above)
790 ms->bot->below = 0; 810 ms->bot->below = 0;
791 811
792 op->flag [FLAG_REMOVED] = true; 812 op->flag [FLAG_REMOVED] = true;
793 813
814 object *head = op->head_ ();
794 if (op == op->head_ ()) 815 if (op == head)
816 op->destroy ();
817 else if (head->map != op->map)
795 { 818 {
796 op->destroy_inv (false); 819 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
797 op->destroy (); 820 head->destroy ();
798 } 821 }
799 } 822 }
800 823
801 sfree (spaces, size ()), spaces = 0; 824 sfree0 (spaces, size ());
802 } 825 }
803 826
804 if (buttons) 827 if (buttons)
805 free_objectlinkpt (buttons), buttons = 0; 828 free_objectlinkpt (buttons), buttons = 0;
806 829
807 sfree (regions, size ()); regions = 0; 830 sfree0 (regions, size ());
808 delete [] regionmap; regionmap = 0; 831 delete [] regionmap; regionmap = 0;
809} 832}
810 833
811void 834void
812maptile::clear_header () 835maptile::clear_header ()
913 op->destroy (); 936 op->destroy ();
914 } 937 }
915} 938}
916 939
917/* 940/*
918 * Updates every button on the map (by calling update_button() for them).
919 */
920void
921maptile::update_buttons ()
922{
923 for (oblinkpt *obp = buttons; obp; obp = obp->next)
924 for (objectlink *ol = obp->link; ol; ol = ol->next)
925 {
926 if (!ol->ob)
927 {
928 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
929 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
930 continue;
931 }
932
933 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
934 {
935 update_button (ol->ob);
936 break;
937 }
938 }
939}
940
941/*
942 * This routine is supposed to find out the difficulty of the map. 941 * This routine is supposed to find out the difficulty of the map.
943 * difficulty does not have a lot to do with character level, 942 * difficulty does not have a lot to do with character level,
944 * but does have a lot to do with treasure on the map. 943 * but does have a lot to do with treasure on the map.
945 * 944 *
946 * Difficulty can now be set by the map creature. If the value stored 945 * Difficulty can now be set by the map creator. If the value stored
947 * in the map is zero, then use this routine. Maps should really 946 * in the map is zero, then use this routine. Maps should really
948 * have a difficulty set than using this function - human calculation 947 * have a difficulty set rather than using this function - human calculation
949 * is much better than this functions guesswork. 948 * is much better than this function's guesswork.
950 */ 949 */
951int 950int
952maptile::estimate_difficulty () const 951maptile::estimate_difficulty () const
953{ 952{
954 long monster_cnt = 0; 953 long monster_cnt = 0;
966 965
967 if (QUERY_FLAG (op, FLAG_GENERATOR)) 966 if (QUERY_FLAG (op, FLAG_GENERATOR))
968 { 967 {
969 total_exp += op->stats.exp; 968 total_exp += op->stats.exp;
970 969
971 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 970 if (archetype *at = op->other_arch)
971 {
972 total_exp += at->stats.exp * 8; 972 total_exp += at->stats.exp * 8;
973
974 monster_cnt++; 973 monster_cnt++;
974 }
975
976 for (object *inv = op->inv; inv; inv = inv->below)
977 {
978 total_exp += op->stats.exp * 8;
979 monster_cnt++;
980 }
975 } 981 }
976 } 982 }
977 983
978 avgexp = (double) total_exp / monster_cnt; 984 avgexp = (double) total_exp / monster_cnt;
979 985
992 * postive values make it darker, negative make it brighter 998 * postive values make it darker, negative make it brighter
993 */ 999 */
994int 1000int
995maptile::change_map_light (int change) 1001maptile::change_map_light (int change)
996{ 1002{
997 int new_level = darkness + change;
998
999 /* Nothing to do */ 1003 /* Nothing to do */
1000 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1004 if (!change)
1001 return 0; 1005 return 0;
1002 1006
1003 /* inform all players on the map */ 1007 /* inform all players on the map */
1004 if (change > 0) 1008 if (change > 0)
1005 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1009 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1006 else 1010 else
1007 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1011 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1008 1012
1009 /* Do extra checking. since darkness is a unsigned value, 1013 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1010 * we need to be extra careful about negative values.
1011 * In general, the checks below are only needed if change
1012 * is not +/-1
1013 */
1014 if (new_level < 0)
1015 darkness = 0;
1016 else if (new_level >= MAX_DARKNESS)
1017 darkness = MAX_DARKNESS;
1018 else
1019 darkness = new_level;
1020 1014
1021 /* All clients need to get re-updated for the change */ 1015 /* All clients need to get re-updated for the change */
1022 update_all_map_los (this); 1016 update_all_map_los (this);
1017
1023 return 1; 1018 return 1;
1024} 1019}
1025 1020
1026/* 1021/*
1027 * This function updates various attributes about a specific space 1022 * This function updates various attributes about a specific space
1030 * through, etc) 1025 * through, etc)
1031 */ 1026 */
1032void 1027void
1033mapspace::update_ () 1028mapspace::update_ ()
1034{ 1029{
1035 object *tmp, *last = 0; 1030 object *last = 0;
1036 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1031 uint8 flags = P_UPTODATE, anywhere = 0;
1032 sint8 light = 0;
1037 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1033 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1038 1034
1039 //object *middle = 0; 1035 //object *middle = 0;
1040 //object *top = 0; 1036 //object *top = 0;
1041 //object *floor = 0; 1037 //object *floor = 0;
1042 // this seems to generate better code than using locals, above 1038 // this seems to generate better code than using locals, above
1043 object *&top = faces_obj[0] = 0; 1039 object *&top = faces_obj[0] = 0;
1044 object *&middle = faces_obj[1] = 0; 1040 object *&middle = faces_obj[1] = 0;
1045 object *&floor = faces_obj[2] = 0; 1041 object *&floor = faces_obj[2] = 0;
1046 1042
1047 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1043 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1048 { 1044 {
1049 /* This could be made additive I guess (two lights better than 1045 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1050 * one). But if so, it shouldn't be a simple additive - 2
1051 * light bulbs do not illuminate twice as far as once since
1052 * it is a dissapation factor that is cubed.
1053 */
1054 if (tmp->glow_radius > light)
1055 light = tmp->glow_radius; 1046 light += tmp->glow_radius;
1056 1047
1057 /* This call is needed in order to update objects the player 1048 /* This call is needed in order to update objects the player
1058 * is standing in that have animations (ie, grass, fire, etc). 1049 * is standing in that have animations (ie, grass, fire, etc).
1059 * However, it also causes the look window to be re-drawn 1050 * However, it also causes the look window to be re-drawn
1060 * 3 times each time the player moves, because many of the 1051 * 3 times each time the player moves, because many of the
1079 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1070 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1080 { 1071 {
1081 middle = tmp; 1072 middle = tmp;
1082 anywhere = 1; 1073 anywhere = 1;
1083 } 1074 }
1075
1084 /* Find the highest visible face around. If equal 1076 /* Find the highest visible face around. If equal
1085 * visibilities, we still want the one nearer to the 1077 * visibilities, we still want the one nearer to the
1086 * top 1078 * top
1087 */ 1079 */
1088 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1080 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1107 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1099 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1108 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1100 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1109 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1101 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1110 } 1102 }
1111 1103
1112 this->light = light; 1104 this->light = min (light, MAX_LIGHT_RADIUS);
1113 this->flags_ = flags; 1105 this->flags_ = flags;
1114 this->move_block = move_block & ~move_allow; 1106 this->move_block = move_block & ~move_allow;
1115 this->move_on = move_on; 1107 this->move_on = move_on;
1116 this->move_off = move_off; 1108 this->move_off = move_off;
1117 this->move_slow = move_slow; 1109 this->move_slow = move_slow;
1137 * 1) top face is set, need middle to be set. 1129 * 1) top face is set, need middle to be set.
1138 * 2) middle is set, need to set top. 1130 * 2) middle is set, need to set top.
1139 * 3) neither middle or top is set - need to set both. 1131 * 3) neither middle or top is set - need to set both.
1140 */ 1132 */
1141 1133
1142 for (tmp = last; tmp; tmp = tmp->below) 1134 for (object *tmp = last; tmp; tmp = tmp->below)
1143 { 1135 {
1144 /* Once we get to a floor, stop, since we already have a floor object */ 1136 /* Once we get to a floor, stop, since we already have a floor object */
1145 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1137 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1146 break; 1138 break;
1147 1139
1199 vol += op->volume (); 1191 vol += op->volume ();
1200 1192
1201 return vol; 1193 return vol;
1202} 1194}
1203 1195
1204bool 1196maptile *
1205maptile::tile_available (int dir, bool load) 1197maptile::tile_available (int dir, bool load)
1206{ 1198{
1207 if (!tile_path[dir]) 1199 if (tile_path[dir])
1208 return 0; 1200 {
1209
1210 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1201 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1211 return 1; 1202 return tile_map[dir];
1212 1203
1213 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1204 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1214 return 1; 1205 return tile_map[dir];
1206 }
1215 1207
1216 return 0; 1208 return 0;
1217} 1209}
1218 1210
1219/* this returns TRUE if the coordinates (x,y) are out of 1211/* this returns TRUE if the coordinates (x,y) are out of
1525 else 1517 else
1526 { 1518 {
1527 retval->distance_x += op2->x - x; 1519 retval->distance_x += op2->x - x;
1528 retval->distance_y += op2->y - y; 1520 retval->distance_y += op2->y - y;
1529 1521
1530 retval->part = NULL; 1522 retval->part = 0;
1531 retval->distance = idistance (retval->distance_x, retval->distance_y); 1523 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1532 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1524 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1533 } 1525 }
1534} 1526}
1535 1527
1536/* Returns true of op1 and op2 are effectively on the same map 1528/* Returns true of op1 and op2 are effectively on the same map
1550} 1542}
1551 1543
1552object * 1544object *
1553maptile::insert (object *op, int x, int y, object *originator, int flags) 1545maptile::insert (object *op, int x, int y, object *originator, int flags)
1554{ 1546{
1555 if (!op->flag [FLAG_REMOVED])
1556 op->remove ();
1557
1558 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1547 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1559} 1548}
1560 1549
1561region * 1550region *
1562maptile::region (int x, int y) const 1551maptile::region (int x, int y) const
1572 1561
1573 return ::region::default_region (); 1562 return ::region::default_region ();
1574} 1563}
1575 1564
1576/* picks a random object from a style map. 1565/* picks a random object from a style map.
1577 * Redone by MSW so it should be faster and not use static
1578 * variables to generate tables.
1579 */ 1566 */
1580object * 1567object *
1581maptile::pick_random_object () const 1568maptile::pick_random_object (rand_gen &gen) const
1582{ 1569{
1583 /* while returning a null object will result in a crash, that 1570 /* while returning a null object will result in a crash, that
1584 * is actually preferable to an infinite loop. That is because 1571 * is actually preferable to an infinite loop. That is because
1585 * most servers will automatically restart in case of crash. 1572 * most servers will automatically restart in case of crash.
1586 * Change the logic on getting the random space - shouldn't make 1573 * Change the logic on getting the random space - shouldn't make
1587 * any difference, but this seems clearer to me. 1574 * any difference, but this seems clearer to me.
1588 */ 1575 */
1589 for (int i = 1000; --i;) 1576 for (int i = 1000; --i;)
1590 { 1577 {
1591 object *pick = at (rndm (width), rndm (height)).bot; 1578 object *pick = at (gen (width), gen (height)).bot;
1592 1579
1593 // do not prefer big monsters just because they are big. 1580 // do not prefer big monsters just because they are big.
1594 if (pick && pick->head_ () == pick) 1581 if (pick && pick->is_head ())
1595 return pick->head_ (); 1582 return pick->head_ ();
1596 } 1583 }
1597 1584
1598 // instead of crashing in the unlikely(?) case, try to return *something* 1585 // instead of crashing in the unlikely(?) case, try to return *something*
1599 return get_archetype ("blocked"); 1586 return archetype::find ("bug");
1600} 1587}
1601 1588
1602void 1589void
1603maptile::play_sound (faceidx sound, int x, int y) const 1590maptile::play_sound (faceidx sound, int x, int y) const
1604{ 1591{
1605 if (!sound) 1592 if (!sound)
1606 return; 1593 return;
1607 1594
1595 for_all_players_on_map (pl, this)
1596 if (client *ns = pl->ns)
1597 {
1598 int dx = x - pl->ob->x;
1599 int dy = y - pl->ob->y;
1600
1601 int distance = idistance (dx, dy);
1602
1603 if (distance <= MAX_SOUND_DISTANCE)
1604 ns->play_sound (sound, dx, dy);
1605 }
1606}
1607
1608void
1609maptile::say_msg (const char *msg, int x, int y) const
1610{
1608 for_all_players (pl) 1611 for_all_players (pl)
1609 if (pl->observe->map == this)
1610 if (client *ns = pl->ns) 1612 if (client *ns = pl->ns)
1611 { 1613 {
1612 int dx = x - pl->observe->x; 1614 int dx = x - pl->ob->x;
1613 int dy = y - pl->observe->y; 1615 int dy = y - pl->ob->y;
1614 1616
1615 int distance = idistance (dx, dy); 1617 int distance = idistance (dx, dy);
1616 1618
1617 if (distance <= MAX_SOUND_DISTANCE) 1619 if (distance <= MAX_SOUND_DISTANCE)
1618 ns->play_sound (sound, dx, dy); 1620 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1619 } 1621 }
1620} 1622}
1621 1623
1624static void
1625split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1626{
1627 // clip to map to the left
1628 if (x0 < 0)
1629 {
1630 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1631 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1632
1633 if (x1 < 0) // entirely to the left
1634 return;
1635
1636 x0 = 0;
1637 }
1638
1639 // clip to map to the right
1640 if (x1 > m->width)
1641 {
1642 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1643 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1644
1645 if (x0 > m->width) // entirely to the right
1646 return;
1647
1648 x1 = m->width;
1649 }
1650
1651 // clip to map above
1652 if (y0 < 0)
1653 {
1654 if (maptile *tile = m->tile_available (TILE_UP, 1))
1655 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1656
1657 if (y1 < 0) // entirely above
1658 return;
1659
1660 y0 = 0;
1661 }
1662
1663 // clip to map below
1664 if (y1 > m->height)
1665 {
1666 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1667 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1668
1669 if (y0 > m->height) // entirely below
1670 return;
1671
1672 y1 = m->height;
1673 }
1674
1675 // if we get here, the rect is within the current map
1676 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1677
1678 r->m = m;
1679 r->x0 = x0;
1680 r->y0 = y0;
1681 r->x1 = x1;
1682 r->y1 = y1;
1683 r->dx = dx;
1684 r->dy = dy;
1685}
1686
1687maprect *
1688maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1689{
1690 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1691 buf.clear ();
1692
1693 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1694
1695 // add end marker
1696 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1697 r->m = 0;
1698
1699 return (maprect *)buf.linearise ();
1700}
1701

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines