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.118 by root, Fri Aug 24 00:40:31 2007 UTC vs.
Revision 1.161 by root, Mon Oct 12 21:27:55 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 {
121
122 /* This must be before the checks below. Code for inventory checkers. */ 119 /* This must be before the checks below. Code for inventory checkers. */
123 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 120 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
124 { 121 {
122 bool have = check_inv_recursive (ob, tmp);
123
125 /* If last_sp is set, the player/monster needs an object, 124 /* 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 125 * so we check for it. If they don't have it, they can't
127 * pass through this space. 126 * pass through this space.
128 */ 127 */
129 if (tmp->last_sp) 128 if (tmp->last_sp)
130 { 129 {
131 if (check_inv_recursive (ob, tmp) == NULL) 130 if (!have)
132 return 1; 131 return 1;
133 else
134 continue;
135 } 132 }
136 else 133 else
137 { 134 {
138 /* In this case, the player must not have the object - 135 /* In this case, the player must not have the object -
139 * if they do, they can't pass through. 136 * if they do, they can't pass through.
140 */ 137 */
141 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */ 138 if (have)
142 return 1; 139 return 1;
143 else
144 continue;
145 } 140 }
146 } /* if check_inv */ 141 }
147 else 142 else
148 { 143 {
149 /* Broke apart a big nasty if into several here to make 144 /* Broke apart a big nasty if into several here to make
150 * this more readable. first check - if the space blocks 145 * this more readable. first check - if the space blocks
151 * movement, can't move here. 146 * movement, can't move here.
152 * second - if a monster, can't move there, unless it is a 147 * second - if a monster, can't move there, unless it is a
153 * hidden dm 148 * dm.
154 */ 149 */
155 if (OB_MOVE_BLOCK (ob, tmp)) 150 if (OB_MOVE_BLOCK (ob, tmp))
156 return 1; 151 return 1;
157 152
158 if (tmp->flag [FLAG_ALIVE] 153 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob 154 && tmp->head_ () != ob
160 && tmp != ob 155 && tmp != ob
161 && tmp->type != DOOR 156 && tmp->type != DOOR
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 157 && !tmp->flag [FLAG_WIZ])
163 return 1; 158 return 1;
164 } 159 }
165
166 } 160 }
161
167 return 0; 162 return 0;
168} 163}
169 164
170/* 165/*
171 * Returns true if the given object can't fit in the given spot. 166 * 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, 167 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 168 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 169 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 170 * object and makes sure they can be inserted.
176 * 171 *
177 * While this doesn't call out of map, the get_map_flags does. 172 * While this doesn't call out of map, the get_map_flags does.
178 * 173 *
179 * This function has been used to deprecate arch_out_of_map - 174 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 175 * this function also does that check, and since in most cases,
… …
191 * 186 *
192 * Note this used to be arch_blocked, but with new movement 187 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 188 * code, we need to have actual object to check its move_type
194 * against the move_block values. 189 * against the move_block values.
195 */ 190 */
196int 191bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 192object::blocked (maptile *m, int x, int y) const
198{ 193{
199 archetype *tmp; 194 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 } 195 {
196 mapxy pos (m, x + tmp->x, y + tmp->y);
213 197
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 198 if (!pos.normalise ())
215 { 199 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 200
218 if (flag & P_OUT_OF_MAP) 201 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 202
220 if (flag & P_IS_ALIVE) 203 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 204 return 1;
222 205
223 mapspace &ms = m1->at (sx, sy); 206 /* However, often ob doesn't have any move type
224 207 * (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. 208 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 209 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 210 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 211 continue;
232 212
233 /* Note it is intentional that we check ob - the movement type of the 213 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 214 * head of the object should correspond for the entire object.
235 */ 215 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 216 if (ms.blocks (move_type))
237 return P_NO_PASS; 217 return 1;
238 } 218 }
239 219
240 return 0; 220 return 0;
241} 221}
242 222
… …
260 240
261 insert_ob_in_ob (tmp, container); 241 insert_ob_in_ob (tmp, container);
262 tmp = next; 242 tmp = next;
263 } 243 }
264 244
265 /* sum_weight will go through and calculate what all the containers are 245 // go through and calculate what all the containers are carrying.
266 * carrying. 246 //TODO: remove
267 */ 247 container->update_weight ();
268 sum_weight (container);
269} 248}
270 249
271void 250void
272maptile::set_object_flag (int flag, int value) 251maptile::set_object_flag (int flag, int value)
273{ 252{
… …
275 return; 254 return;
276 255
277 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 256 for (mapspace *ms = spaces + size (); ms-- > spaces; )
278 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 257 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
279 tmp->flag [flag] = value; 258 tmp->flag [flag] = value;
259}
260
261void
262maptile::post_load_original ()
263{
264 if (!spaces)
265 return;
266
267 set_object_flag (FLAG_OBJ_ORIGINAL);
268
269 for (mapspace *ms = spaces + size (); ms-- > spaces; )
270 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
271 INVOKE_OBJECT (RESET, tmp);
280} 272}
281 273
282/* link_multipart_objects go through all the objects on the map looking 274/* 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 275 * 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 276 * info we have, they only have the head (as would be expected when
… …
322bool 314bool
323maptile::_load_objects (object_thawer &f) 315maptile::_load_objects (object_thawer &f)
324{ 316{
325 for (;;) 317 for (;;)
326 { 318 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 319 coroapi::cede_to_tick (); // cede once in a while
328 320
329 switch (f.kw) 321 switch (f.kw)
330 { 322 {
331 case KW_arch: 323 case KW_arch:
332 if (object *op = object::read (f, this)) 324 if (object *op = object::read (f, this))
333 { 325 {
326 // TODO: why?
334 if (op->inv) 327 if (op->inv)
335 sum_weight (op); 328 op->update_weight ();
336 329
337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 330 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
331 {
332 // we insert manually because
333 // a) its way faster
334 // b) we remove manually, too, and there are good reasons for that
335 // c) it's correct
336 mapspace &ms = at (op->x, op->y);
337
338 op->flag [FLAG_REMOVED] = false;
339
340 op->above = 0;
341 op->below = ms.top;
342
343 *(ms.top ? &ms.top->above : &ms.bot) = op;
344
345 ms.top = op;
346 ms.flags_ = 0;
347 }
348 else
349 {
350 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
351 op->destroy ();
352 }
338 } 353 }
339 354
340 continue; 355 continue;
341 356
342 case KW_EOF: 357 case KW_EOF:
… …
383 if (!spaces) 398 if (!spaces)
384 return false; 399 return false;
385 400
386 for (int i = 0; i < size (); ++i) 401 for (int i = 0; i < size (); ++i)
387 { 402 {
388 int unique = 0; 403 bool unique = 0;
404
389 for (object *op = spaces [i].bot; op; op = op->above) 405 for (object *op = spaces [i].bot; op; op = op->above)
390 { 406 {
391 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 407 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
392 unique = 1;
393 408
394 if (!op->can_map_save ()) 409 if (expect_false (!op->can_map_save ()))
395 continue; 410 continue;
396 411
397 if (unique || op->flag [FLAG_UNIQUE]) 412 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
398 { 413 {
399 if (flags & IO_UNIQUES) 414 if (flags & IO_UNIQUES)
400 op->write (f); 415 op->write (f);
401 } 416 }
402 else if (flags & IO_OBJECTS) 417 else if (expect_true (flags & IO_OBJECTS))
403 op->write (f); 418 op->write (f);
404 } 419 }
405 } 420 }
406 421
407 coroapi::cede_to_tick (); 422 coroapi::cede_to_tick ();
408 423
409 return true; 424 return true;
410}
411
412bool
413maptile::_load_objects (const char *path, bool skip_header)
414{
415 object_thawer f (path);
416
417 if (!f)
418 return false;
419
420 f.next ();
421
422 if (skip_header)
423 for (;;)
424 {
425 keyword kw = f.kw;
426 f.skip ();
427 if (kw == KW_end)
428 break;
429 }
430
431 return _load_objects (f);
432} 425}
433 426
434bool 427bool
435maptile::_save_objects (const char *path, int flags) 428maptile::_save_objects (const char *path, int flags)
436{ 429{
… …
611bool 604bool
612maptile::_load_header (object_thawer &thawer) 605maptile::_load_header (object_thawer &thawer)
613{ 606{
614 for (;;) 607 for (;;)
615 { 608 {
616 thawer.next ();
617
618 switch (thawer.kw) 609 switch (thawer.kw)
619 { 610 {
620 case KW_msg: 611 case KW_msg:
621 thawer.get_ml (KW_endmsg, msg); 612 thawer.get_ml (KW_endmsg, msg);
622 break; 613 break;
… …
656 case KW_sky: thawer.get (sky); break; 647 case KW_sky: thawer.get (sky); break;
657 648
658 case KW_per_player: thawer.get (per_player); break; 649 case KW_per_player: thawer.get (per_player); break;
659 case KW_per_party: thawer.get (per_party); break; 650 case KW_per_party: thawer.get (per_party); break;
660 case KW_no_reset: thawer.get (no_reset); break; 651 case KW_no_reset: thawer.get (no_reset); break;
652 case KW_no_drop: thawer.get (no_drop); break;
661 653
662 case KW_region: default_region = region::find (thawer.get_str ()); break; 654 case KW_region: default_region = region::find (thawer.get_str ()); break;
663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 655 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
664 656
665 // old names new names 657 // old names new names
… …
677 case KW_tile_path_2: thawer.get (tile_path [1]); break; 669 case KW_tile_path_2: thawer.get (tile_path [1]); break;
678 case KW_tile_path_3: thawer.get (tile_path [2]); break; 670 case KW_tile_path_3: thawer.get (tile_path [2]); break;
679 case KW_tile_path_4: thawer.get (tile_path [3]); break; 671 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680 672
681 case KW_ERROR: 673 case KW_ERROR:
682 set_key (thawer.kw_str, thawer.value); 674 set_key_text (thawer.kw_str, thawer.value);
683 break; 675 break;
684 676
685 case KW_end: 677 case KW_end:
678 thawer.next ();
686 return true; 679 return true;
687 680
688 default: 681 default:
689 if (!thawer.parse_error ("map", 0)) 682 if (!thawer.parse_error ("map", 0))
690 return false; 683 return false;
691 break; 684 break;
692 } 685 }
686
687 thawer.next ();
693 } 688 }
694 689
695 abort (); 690 abort ();
696}
697
698bool
699maptile::_load_header (const char *path)
700{
701 object_thawer thawer (path);
702
703 if (!thawer)
704 return false;
705
706 return _load_header (thawer);
707} 691}
708 692
709/****************************************************************************** 693/******************************************************************************
710 * This is the start of unique map handling code 694 * This is the start of unique map handling code
711 *****************************************************************************/ 695 *****************************************************************************/
… …
723 707
724 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 708 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
725 unique = 1; 709 unique = 1;
726 710
727 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 711 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
728 {
729 op->destroy_inv (false);
730 op->destroy (); 712 op->destroy ();
731 }
732 713
733 op = above; 714 op = above;
734 } 715 }
735 } 716 }
736} 717}
… …
747 MAP_OUT (swap_time); 728 MAP_OUT (swap_time);
748 MAP_OUT (reset_time); 729 MAP_OUT (reset_time);
749 MAP_OUT (reset_timeout); 730 MAP_OUT (reset_timeout);
750 MAP_OUT (fixed_resettime); 731 MAP_OUT (fixed_resettime);
751 MAP_OUT (no_reset); 732 MAP_OUT (no_reset);
733 MAP_OUT (no_drop);
752 MAP_OUT (difficulty); 734 MAP_OUT (difficulty);
753 735
754 if (default_region) MAP_OUT2 (region, default_region->name); 736 if (default_region) MAP_OUT2 (region, default_region->name);
755 737
756 if (shopitems) 738 if (shopitems)
… …
810 * Remove and free all objects in the given map. 792 * Remove and free all objects in the given map.
811 */ 793 */
812void 794void
813maptile::clear () 795maptile::clear ()
814{ 796{
815 sfree (regions, size ()); regions = 0;
816 delete [] regionmap; regionmap = 0;
817
818 if (spaces) 797 if (spaces)
819 { 798 {
820 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 799 for (mapspace *ms = spaces + size (); ms-- > spaces; )
821 while (object *op = ms->bot) 800 while (object *op = ms->bot)
822 { 801 {
802 // manually remove, as to not trigger anything
803 if (ms->bot = op->above)
804 ms->bot->below = 0;
805
806 op->flag [FLAG_REMOVED] = true;
807
823 op = op->head_ (); 808 object *head = op->head_ ();
824 op->destroy_inv (false); 809 if (op == head)
825 op->destroy (); 810 op->destroy ();
811 else if (head->map != op->map)
812 {
813 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
814 head->destroy ();
815 }
826 } 816 }
827 817
828 sfree (spaces, size ()), spaces = 0; 818 sfree0 (spaces, size ());
829 } 819 }
830 820
831 if (buttons) 821 if (buttons)
832 free_objectlinkpt (buttons), buttons = 0; 822 free_objectlinkpt (buttons), buttons = 0;
823
824 sfree0 (regions, size ());
825 delete [] regionmap; regionmap = 0;
833} 826}
834 827
835void 828void
836maptile::clear_header () 829maptile::clear_header ()
837{ 830{
… …
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 882 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890 break; 883 break;
891 884
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 885 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 886 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895 || QUERY_FLAG (op, FLAG_UNIQUE) 887 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 888 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID) 889 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ()) 890 || op->is_alive ())
899 ; // do not decay 891 ; // do not decay
… …
938 op->destroy (); 930 op->destroy ();
939 } 931 }
940} 932}
941 933
942/* 934/*
943 * Updates every button on the map (by calling update_button() for them).
944 */
945void
946maptile::update_buttons ()
947{
948 for (oblinkpt *obp = buttons; obp; obp = obp->next)
949 for (objectlink *ol = obp->link; ol; ol = ol->next)
950 {
951 if (!ol->ob)
952 {
953 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
954 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
955 continue;
956 }
957
958 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
959 {
960 update_button (ol->ob);
961 break;
962 }
963 }
964}
965
966/*
967 * This routine is supposed to find out the difficulty of the map. 935 * This routine is supposed to find out the difficulty of the map.
968 * difficulty does not have a lot to do with character level, 936 * difficulty does not have a lot to do with character level,
969 * but does have a lot to do with treasure on the map. 937 * but does have a lot to do with treasure on the map.
970 * 938 *
971 * Difficulty can now be set by the map creature. If the value stored 939 * Difficulty can now be set by the map creator. If the value stored
972 * in the map is zero, then use this routine. Maps should really 940 * in the map is zero, then use this routine. Maps should really
973 * have a difficulty set than using this function - human calculation 941 * have a difficulty set rather than using this function - human calculation
974 * is much better than this functions guesswork. 942 * is much better than this function's guesswork.
975 */ 943 */
976int 944int
977maptile::estimate_difficulty () const 945maptile::estimate_difficulty () const
978{ 946{
979 long monster_cnt = 0; 947 long monster_cnt = 0;
… …
991 959
992 if (QUERY_FLAG (op, FLAG_GENERATOR)) 960 if (QUERY_FLAG (op, FLAG_GENERATOR))
993 { 961 {
994 total_exp += op->stats.exp; 962 total_exp += op->stats.exp;
995 963
996 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 964 if (archetype *at = op->other_arch)
965 {
997 total_exp += at->stats.exp * 8; 966 total_exp += at->stats.exp * 8;
998
999 monster_cnt++; 967 monster_cnt++;
968 }
969
970 for (object *inv = op->inv; inv; inv = inv->below)
971 {
972 total_exp += op->stats.exp * 8;
973 monster_cnt++;
974 }
1000 } 975 }
1001 } 976 }
1002 977
1003 avgexp = (double) total_exp / monster_cnt; 978 avgexp = (double) total_exp / monster_cnt;
1004 979
… …
1017 * postive values make it darker, negative make it brighter 992 * postive values make it darker, negative make it brighter
1018 */ 993 */
1019int 994int
1020maptile::change_map_light (int change) 995maptile::change_map_light (int change)
1021{ 996{
1022 int new_level = darkness + change;
1023
1024 /* Nothing to do */ 997 /* Nothing to do */
1025 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 998 if (!change)
1026 return 0; 999 return 0;
1027 1000
1028 /* inform all players on the map */ 1001 /* inform all players on the map */
1029 if (change > 0) 1002 if (change > 0)
1030 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1003 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1031 else 1004 else
1032 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1005 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1033 1006
1034 /* Do extra checking. since darkness is a unsigned value, 1007 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1035 * we need to be extra careful about negative values.
1036 * In general, the checks below are only needed if change
1037 * is not +/-1
1038 */
1039 if (new_level < 0)
1040 darkness = 0;
1041 else if (new_level >= MAX_DARKNESS)
1042 darkness = MAX_DARKNESS;
1043 else
1044 darkness = new_level;
1045 1008
1046 /* All clients need to get re-updated for the change */ 1009 /* All clients need to get re-updated for the change */
1047 update_all_map_los (this); 1010 update_all_map_los (this);
1011
1048 return 1; 1012 return 1;
1049} 1013}
1050 1014
1051/* 1015/*
1052 * This function updates various attributes about a specific space 1016 * This function updates various attributes about a specific space
… …
1055 * through, etc) 1019 * through, etc)
1056 */ 1020 */
1057void 1021void
1058mapspace::update_ () 1022mapspace::update_ ()
1059{ 1023{
1060 object *tmp, *last = 0; 1024 object *last = 0;
1061 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1025 uint8 flags = P_UPTODATE, anywhere = 0;
1026 sint8 light = 0;
1062 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1027 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1063 1028
1064 //object *middle = 0; 1029 //object *middle = 0;
1065 //object *top = 0; 1030 //object *top = 0;
1066 //object *floor = 0; 1031 //object *floor = 0;
1067 // this seems to generate better code than using locals, above 1032 // this seems to generate better code than using locals, above
1068 object *&top = faces_obj[0] = 0; 1033 object *&top = faces_obj[0] = 0;
1069 object *&middle = faces_obj[1] = 0; 1034 object *&middle = faces_obj[1] = 0;
1070 object *&floor = faces_obj[2] = 0; 1035 object *&floor = faces_obj[2] = 0;
1071 1036
1072 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1037 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1073 { 1038 {
1074 /* This could be made additive I guess (two lights better than 1039 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1075 * one). But if so, it shouldn't be a simple additive - 2
1076 * light bulbs do not illuminate twice as far as once since
1077 * it is a dissapation factor that is cubed.
1078 */
1079 if (tmp->glow_radius > light)
1080 light = tmp->glow_radius; 1040 light += tmp->glow_radius;
1081 1041
1082 /* This call is needed in order to update objects the player 1042 /* This call is needed in order to update objects the player
1083 * is standing in that have animations (ie, grass, fire, etc). 1043 * is standing in that have animations (ie, grass, fire, etc).
1084 * However, it also causes the look window to be re-drawn 1044 * However, it also causes the look window to be re-drawn
1085 * 3 times each time the player moves, because many of the 1045 * 3 times each time the player moves, because many of the
… …
1104 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1064 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1105 { 1065 {
1106 middle = tmp; 1066 middle = tmp;
1107 anywhere = 1; 1067 anywhere = 1;
1108 } 1068 }
1069
1109 /* Find the highest visible face around. If equal 1070 /* Find the highest visible face around. If equal
1110 * visibilities, we still want the one nearer to the 1071 * visibilities, we still want the one nearer to the
1111 * top 1072 * top
1112 */ 1073 */
1113 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1074 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1132 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1093 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1133 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1094 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1134 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1095 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1135 } 1096 }
1136 1097
1137 this->light = light; 1098 this->light = min (light, MAX_LIGHT_RADIUS);
1138 this->flags_ = flags; 1099 this->flags_ = flags;
1139 this->move_block = move_block & ~move_allow; 1100 this->move_block = move_block & ~move_allow;
1140 this->move_on = move_on; 1101 this->move_on = move_on;
1141 this->move_off = move_off; 1102 this->move_off = move_off;
1142 this->move_slow = move_slow; 1103 this->move_slow = move_slow;
… …
1162 * 1) top face is set, need middle to be set. 1123 * 1) top face is set, need middle to be set.
1163 * 2) middle is set, need to set top. 1124 * 2) middle is set, need to set top.
1164 * 3) neither middle or top is set - need to set both. 1125 * 3) neither middle or top is set - need to set both.
1165 */ 1126 */
1166 1127
1167 for (tmp = last; tmp; tmp = tmp->below) 1128 for (object *tmp = last; tmp; tmp = tmp->below)
1168 { 1129 {
1169 /* Once we get to a floor, stop, since we already have a floor object */ 1130 /* Once we get to a floor, stop, since we already have a floor object */
1170 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1131 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1171 break; 1132 break;
1172 1133
… …
1224 vol += op->volume (); 1185 vol += op->volume ();
1225 1186
1226 return vol; 1187 return vol;
1227} 1188}
1228 1189
1229bool 1190maptile *
1230maptile::tile_available (int dir, bool load) 1191maptile::tile_available (int dir, bool load)
1231{ 1192{
1232 if (!tile_path[dir]) 1193 if (tile_path[dir])
1233 return 0; 1194 {
1234
1235 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1195 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1236 return 1; 1196 return tile_map[dir];
1237 1197
1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1198 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1239 return 1; 1199 return tile_map[dir];
1200 }
1240 1201
1241 return 0; 1202 return 0;
1242} 1203}
1243 1204
1244/* this returns TRUE if the coordinates (x,y) are out of 1205/* this returns TRUE if the coordinates (x,y) are out of
… …
1259 if (!m) 1220 if (!m)
1260 return 0; 1221 return 0;
1261 1222
1262 if (x < 0) 1223 if (x < 0)
1263 { 1224 {
1264 if (!m->tile_available (3, 0)) 1225 if (!m->tile_available (3))
1265 return 1; 1226 return 1;
1266 1227
1267 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1228 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1268 } 1229 }
1269 1230
1270 if (x >= m->width) 1231 if (x >= m->width)
1271 { 1232 {
1272 if (!m->tile_available (1, 0)) 1233 if (!m->tile_available (1))
1273 return 1; 1234 return 1;
1274 1235
1275 return out_of_map (m->tile_map[1], x - m->width, y); 1236 return out_of_map (m->tile_map[1], x - m->width, y);
1276 } 1237 }
1277 1238
1278 if (y < 0) 1239 if (y < 0)
1279 { 1240 {
1280 if (!m->tile_available (0, 0)) 1241 if (!m->tile_available (0))
1281 return 1; 1242 return 1;
1282 1243
1283 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1244 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1284 } 1245 }
1285 1246
1286 if (y >= m->height) 1247 if (y >= m->height)
1287 { 1248 {
1288 if (!m->tile_available (2, 0)) 1249 if (!m->tile_available (2))
1289 return 1; 1250 return 1;
1290 1251
1291 return out_of_map (m->tile_map[2], x, y - m->height); 1252 return out_of_map (m->tile_map[2], x, y - m->height);
1292 } 1253 }
1293 1254
… …
1308maptile * 1269maptile *
1309maptile::xy_find (sint16 &x, sint16 &y) 1270maptile::xy_find (sint16 &x, sint16 &y)
1310{ 1271{
1311 if (x < 0) 1272 if (x < 0)
1312 { 1273 {
1313 if (!tile_available (3, 1)) 1274 if (!tile_available (3))
1314 return 0; 1275 return 0;
1315 1276
1316 x += tile_map[3]->width; 1277 x += tile_map[3]->width;
1317 return tile_map[3]->xy_find (x, y); 1278 return tile_map[3]->xy_find (x, y);
1318 } 1279 }
1319 1280
1320 if (x >= width) 1281 if (x >= width)
1321 { 1282 {
1322 if (!tile_available (1, 1)) 1283 if (!tile_available (1))
1323 return 0; 1284 return 0;
1324 1285
1325 x -= width; 1286 x -= width;
1326 return tile_map[1]->xy_find (x, y); 1287 return tile_map[1]->xy_find (x, y);
1327 } 1288 }
1328 1289
1329 if (y < 0) 1290 if (y < 0)
1330 { 1291 {
1331 if (!tile_available (0, 1)) 1292 if (!tile_available (0))
1332 return 0; 1293 return 0;
1333 1294
1334 y += tile_map[0]->height; 1295 y += tile_map[0]->height;
1335 return tile_map[0]->xy_find (x, y); 1296 return tile_map[0]->xy_find (x, y);
1336 } 1297 }
1337 1298
1338 if (y >= height) 1299 if (y >= height)
1339 { 1300 {
1340 if (!tile_available (2, 1)) 1301 if (!tile_available (2))
1341 return 0; 1302 return 0;
1342 1303
1343 y -= height; 1304 y -= height;
1344 return tile_map[2]->xy_find (x, y); 1305 return tile_map[2]->xy_find (x, y);
1345 } 1306 }
… …
1358adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1319adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1359{ 1320{
1360 if (!map1 || !map2) 1321 if (!map1 || !map2)
1361 return 0; 1322 return 0;
1362 1323
1363 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1324 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1364 //fix: compare paths instead (this is likely faster, too!) 1325 //fix: compare paths instead (this is likely faster, too!)
1365 if (map1 == map2) 1326 if (map1 == map2)
1366 { 1327 {
1367 *dx = 0; 1328 *dx = 0;
1368 *dy = 0; 1329 *dy = 0;
… …
1550 else 1511 else
1551 { 1512 {
1552 retval->distance_x += op2->x - x; 1513 retval->distance_x += op2->x - x;
1553 retval->distance_y += op2->y - y; 1514 retval->distance_y += op2->y - y;
1554 1515
1555 retval->part = NULL; 1516 retval->part = 0;
1556 retval->distance = idistance (retval->distance_x, retval->distance_y); 1517 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1557 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1518 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1558 } 1519 }
1559} 1520}
1560 1521
1561/* Returns true of op1 and op2 are effectively on the same map 1522/* Returns true of op1 and op2 are effectively on the same map
… …
1575} 1536}
1576 1537
1577object * 1538object *
1578maptile::insert (object *op, int x, int y, object *originator, int flags) 1539maptile::insert (object *op, int x, int y, object *originator, int flags)
1579{ 1540{
1580 if (!op->flag [FLAG_REMOVED])
1581 op->remove ();
1582
1583 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1541 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1584} 1542}
1585 1543
1586region * 1544region *
1587maptile::region (int x, int y) const 1545maptile::region (int x, int y) const
… …
1597 1555
1598 return ::region::default_region (); 1556 return ::region::default_region ();
1599} 1557}
1600 1558
1601/* picks a random object from a style map. 1559/* picks a random object from a style map.
1602 * Redone by MSW so it should be faster and not use static
1603 * variables to generate tables.
1604 */ 1560 */
1605object * 1561object *
1606maptile::pick_random_object () const 1562maptile::pick_random_object (rand_gen &gen) const
1607{ 1563{
1608 /* while returning a null object will result in a crash, that 1564 /* while returning a null object will result in a crash, that
1609 * is actually preferable to an infinite loop. That is because 1565 * is actually preferable to an infinite loop. That is because
1610 * most servers will automatically restart in case of crash. 1566 * most servers will automatically restart in case of crash.
1611 * Change the logic on getting the random space - shouldn't make 1567 * Change the logic on getting the random space - shouldn't make
1612 * any difference, but this seems clearer to me. 1568 * any difference, but this seems clearer to me.
1613 */ 1569 */
1614 for (int i = 1000; --i;) 1570 for (int i = 1000; --i;)
1615 { 1571 {
1616 object *pick = at (rndm (width), rndm (height)).bot; 1572 object *pick = at (gen (width), gen (height)).bot;
1617 1573
1618 // do not prefer big monsters just because they are big. 1574 // do not prefer big monsters just because they are big.
1619 if (pick && pick->head_ () == pick) 1575 if (pick && pick->is_head ())
1620 return pick->head_ (); 1576 return pick->head_ ();
1621 } 1577 }
1622 1578
1623 // instead of crashing in the unlikely(?) case, try to return *something* 1579 // instead of crashing in the unlikely(?) case, try to return *something*
1624 return get_archetype ("blocked"); 1580 return archetype::find ("bug");
1625} 1581}
1626 1582
1627void 1583void
1628maptile::play_sound (faceidx sound, int x, int y) const 1584maptile::play_sound (faceidx sound, int x, int y) const
1629{ 1585{
1630 if (!sound) 1586 if (!sound)
1631 return; 1587 return;
1632 1588
1589 for_all_players_on_map (pl, this)
1590 if (client *ns = pl->ns)
1591 {
1592 int dx = x - pl->ob->x;
1593 int dy = y - pl->ob->y;
1594
1595 int distance = idistance (dx, dy);
1596
1597 if (distance <= MAX_SOUND_DISTANCE)
1598 ns->play_sound (sound, dx, dy);
1599 }
1600}
1601
1602void
1603maptile::say_msg (const char *msg, int x, int y) const
1604{
1633 for_all_players (pl) 1605 for_all_players (pl)
1634 if (pl->ob->map == this)
1635 if (client *ns = pl->ns) 1606 if (client *ns = pl->ns)
1636 { 1607 {
1637 int dx = x - pl->ob->x; 1608 int dx = x - pl->ob->x;
1638 int dy = y - pl->ob->y; 1609 int dy = y - pl->ob->y;
1639 1610
1640 int distance = idistance (dx, dy); 1611 int distance = idistance (dx, dy);
1641 1612
1642 if (distance <= MAX_SOUND_DISTANCE) 1613 if (distance <= MAX_SOUND_DISTANCE)
1643 ns->play_sound (sound, dx, dy); 1614 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1644 } 1615 }
1645} 1616}
1646 1617
1618static void
1619split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1620{
1621 // clip to map to the left
1622 if (x0 < 0)
1623 {
1624 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1625 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1626
1627 if (x1 < 0) // entirely to the left
1628 return;
1629
1630 x0 = 0;
1631 }
1632
1633 // clip to map to the right
1634 if (x1 > m->width)
1635 {
1636 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1637 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1638
1639 if (x0 > m->width) // entirely to the right
1640 return;
1641
1642 x1 = m->width;
1643 }
1644
1645 // clip to map above
1646 if (y0 < 0)
1647 {
1648 if (maptile *tile = m->tile_available (TILE_UP, 1))
1649 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1650
1651 if (y1 < 0) // entirely above
1652 return;
1653
1654 y0 = 0;
1655 }
1656
1657 // clip to map below
1658 if (y1 > m->height)
1659 {
1660 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1661 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1662
1663 if (y0 > m->height) // entirely below
1664 return;
1665
1666 y1 = m->height;
1667 }
1668
1669 // if we get here, the rect is within the current map
1670 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1671
1672 r->m = m;
1673 r->x0 = x0;
1674 r->y0 = y0;
1675 r->x1 = x1;
1676 r->y1 = y1;
1677 r->dx = dx;
1678 r->dy = dy;
1679}
1680
1681maprect *
1682maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1683{
1684 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1685 buf.clear ();
1686
1687 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1688
1689 // add end marker
1690 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1691 r->m = 0;
1692
1693 return (maprect *)buf.linearise ();
1694}
1695

Diff Legend

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