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.121 by root, Sat Aug 25 22:19:26 2007 UTC vs.
Revision 1.181 by root, Sat Jan 16 13:41:37 2010 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,2010 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"
30
31#include "path.h" 28#include "path.h"
29
30//+GPL
31
32sint8 maptile::outdoor_darkness;
32 33
33/* This rolls up wall, blocks_magic, blocks_view, etc, all into 34/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34 * one function that just returns a P_.. value (see map.h) 35 * one function that just returns a P_.. value (see map.h)
35 * it will also do map translation for tiled maps, returning 36 * it will also do map translation for tiled maps, returning
36 * new values into newmap, nx, and ny. Any and all of those 37 * new values into newmap, nx, and ny. Any and all of those
… …
71 * by the caller. 72 * by the caller.
72 */ 73 */
73int 74int
74blocked_link (object *ob, maptile *m, int sx, int sy) 75blocked_link (object *ob, maptile *m, int sx, int sy)
75{ 76{
76 object *tmp;
77 int mflags, blocked;
78
79 /* Make sure the coordinates are valid - they should be, as caller should 77 /* Make sure the coordinates are valid - they should be, as caller should
80 * have already checked this. 78 * have already checked this.
81 */ 79 */
82 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
83 { 81 {
84 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 82 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
85 return 1; 83 return 1;
86 } 84 }
87 85
88 /* Save some cycles - instead of calling get_map_flags(), just get the value 86 mapspace &ms = m->at (sx, sy);
89 * directly.
90 */
91 mflags = m->at (sx, sy).flags ();
92 87
93 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 88 int mflags = ms.flags ();
89 int blocked = ms.move_block;
94 90
95 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
96 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
97 * things we need to do for players. 93 * things we need to do for players.
98 */ 94 */
99 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
100 return 0; 96 return 0;
101 97
102 /* if there isn't anytyhing alive on this space, and this space isn't 98 /* 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 99 * 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 100 * 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 101 * or another. Likewise, only if something is blocking us do we
106 * need to investigate if there is a special circumstance that would 102 * need to investigate if there is a special circumstance that would
107 * let the player through (inventory checkers for example) 103 * let the player through (inventory checkers for example)
… …
114 /* We basically go through the stack of objects, and if there is 110 /* We basically go through the stack of objects, and if there is
115 * some other object that has NO_PASS or FLAG_ALIVE set, return 111 * some other object that has NO_PASS or FLAG_ALIVE set, return
116 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
117 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
118 */ 114 */
119 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 115 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
120 { 116 {
121 117 if (OB_MOVE_BLOCK (ob, tmp))
122 /* This must be before the checks below. Code for inventory checkers. */
123 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
124 { 118 {
125 /* If last_sp is set, the player/monster needs an object, 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
126 * so we check for it. If they don't have it, they can't 120 if (RESULT_INT (0))
127 * pass through this space. 121 return 1;
128 */ 122 else
129 if (tmp->last_sp) 123 continue;
124
125 if (tmp->type == CHECK_INV)
130 { 126 {
131 if (check_inv_recursive (ob, tmp) == NULL) 127 bool have = check_inv_recursive (ob, tmp);
128
129 // last_sp set means we block if we don't have.
130 if (logical_xor (have, tmp->last_sp))
132 return 1; 131 return 1;
133 else 132 }
134 continue; 133 else if (tmp->type == T_MATCH)
134 {
135 // T_MATCH allows "entrance" iff the match is true
136 // == blocks if the match fails
137
138 // we could have used an INVOKE_OBJECT, but decided against it, as we
139 // assume that T_MATCH is relatively common.
140 if (!match (tmp->slaying, ob, tmp, ob))
141 return 1;
135 } 142 }
136 else 143 else
137 { 144 return 1; // unconditional block
138 /* In this case, the player must not have the object - 145
139 * if they do, they can't pass through.
140 */
141 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
142 return 1;
143 else
144 continue;
145 }
146 } /* if check_inv */
147 else 146 } else {
148 { 147 // space does not block the ob, directly, but
149 /* Broke apart a big nasty if into several here to make 148 // anything alive that is not a door still
150 * this more readable. first check - if the space blocks 149 // blocks anything but wizards.
151 * movement, can't move here.
152 * second - if a monster, can't move there, unless it is a
153 * hidden dm
154 */
155 if (OB_MOVE_BLOCK (ob, tmp))
156 return 1;
157 150
158 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob 152 && tmp->head_ () != ob
160 && tmp != ob 153 && tmp != ob
161 && tmp->type != DOOR 154 && tmp->type != DOOR)
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
163 return 1; 155 return 1;
164 } 156 }
165
166 } 157 }
158
167 return 0; 159 return 0;
168} 160}
169 161
170/* 162/*
171 * Returns true if the given object can't fit in the given spot. 163 * 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, 164 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 165 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 166 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 167 * object and makes sure they can be inserted.
176 * 168 *
177 * While this doesn't call out of map, the get_map_flags does. 169 * While this doesn't call out of map, the get_map_flags does.
178 * 170 *
179 * This function has been used to deprecate arch_out_of_map - 171 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 172 * this function also does that check, and since in most cases,
… …
191 * 183 *
192 * Note this used to be arch_blocked, but with new movement 184 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 185 * code, we need to have actual object to check its move_type
194 * against the move_block values. 186 * against the move_block values.
195 */ 187 */
196int 188bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 189object::blocked (maptile *m, int x, int y) const
198{ 190{
199 archetype *tmp; 191 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 } 192 {
193 mapxy pos (m, x + tmp->x, y + tmp->y);
213 194
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 195 if (!pos.normalise ())
215 { 196 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 197
218 if (flag & P_OUT_OF_MAP) 198 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 199
220 if (flag & P_IS_ALIVE) 200 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 201 return 1;
222 202
223 mapspace &ms = m1->at (sx, sy); 203 /* However, often ob doesn't have any move type
224 204 * (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. 205 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 206 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 207 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 208 continue;
232 209
233 /* Note it is intentional that we check ob - the movement type of the 210 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 211 * head of the object should correspond for the entire object.
235 */ 212 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 213 if (ms.blocks (move_type))
237 return P_NO_PASS; 214 return 1;
238 } 215 }
239 216
240 return 0; 217 return 0;
241} 218}
242 219
243/* When the map is loaded, load_object does not actually insert objects 220//-GPL
244 * into inventory, but just links them. What this does is go through
245 * and insert them properly.
246 * The object 'container' is the object that contains the inventory.
247 * This is needed so that we can update the containers weight.
248 */
249void
250fix_container (object *container)
251{
252 object *tmp = container->inv, *next;
253
254 container->inv = 0;
255 while (tmp)
256 {
257 next = tmp->below;
258 if (tmp->inv)
259 fix_container (tmp);
260
261 insert_ob_in_ob (tmp, container);
262 tmp = next;
263 }
264
265 /* sum_weight will go through and calculate what all the containers are
266 * carrying.
267 */
268 sum_weight (container);
269}
270 221
271void 222void
272maptile::set_object_flag (int flag, int value) 223maptile::set_object_flag (int flag, int value)
273{ 224{
274 if (!spaces) 225 if (!spaces)
… …
276 227
277 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 228 for (mapspace *ms = spaces + size (); ms-- > spaces; )
278 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 229 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
279 tmp->flag [flag] = value; 230 tmp->flag [flag] = value;
280} 231}
232
233void
234maptile::post_load_original ()
235{
236 if (!spaces)
237 return;
238
239 set_object_flag (FLAG_OBJ_ORIGINAL);
240
241 for (mapspace *ms = spaces + size (); ms-- > spaces; )
242 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
243 INVOKE_OBJECT (RESET, tmp);
244}
245
246void
247maptile::post_load ()
248{
249#if 0
250 if (!spaces)
251 return;
252
253 for (mapspace *ms = spaces + size (); ms-- > spaces; )
254 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
255 ; // nop
256#endif
257}
258
259//+GPL
281 260
282/* link_multipart_objects go through all the objects on the map looking 261/* 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 262 * 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 263 * info we have, they only have the head (as would be expected when
285 * they are saved). 264 * they are saved).
… …
313 op = op->above; 292 op = op->above;
314 } 293 }
315 } 294 }
316} 295}
317 296
297//-GPL
298
318/* 299/*
319 * Loads (ands parses) the objects into a given map from the specified 300 * Loads (ands parses) the objects into a given map from the specified
320 * file pointer. 301 * file pointer.
321 */ 302 */
322bool 303bool
323maptile::_load_objects (object_thawer &f) 304maptile::_load_objects (object_thawer &f)
324{ 305{
325 for (;;) 306 for (;;)
326 { 307 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 308 coroapi::cede_to_tick (); // cede once in a while
328 309
329 switch (f.kw) 310 switch (f.kw)
330 { 311 {
331 case KW_arch: 312 case KW_arch:
332 if (object *op = object::read (f, this)) 313 if (object *op = object::read (f, this))
333 { 314 {
315 // TODO: why?
334 if (op->inv) 316 if (op->inv)
335 sum_weight (op); 317 op->update_weight ();
336 318
337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 319 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
320 {
321 // we insert manually because
322 // a) its way faster
323 // b) we remove manually, too, and there are good reasons for that
324 // c) it's correct
325 mapspace &ms = at (op->x, op->y);
326
327 op->flag [FLAG_REMOVED] = false;
328
329 op->above = 0;
330 op->below = ms.top;
331
332 *(ms.top ? &ms.top->above : &ms.bot) = op;
333
334 ms.top = op;
335 ms.flags_ = 0;
336 }
337 else
338 {
339 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
340 op->destroy ();
341 }
338 } 342 }
339 343
340 continue; 344 continue;
341 345
342 case KW_EOF: 346 case KW_EOF:
… …
408 412
409 return true; 413 return true;
410} 414}
411 415
412bool 416bool
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}
433
434bool
435maptile::_save_objects (const char *path, int flags) 417maptile::_save_objects (const char *path, int flags)
436{ 418{
437 object_freezer freezer; 419 object_freezer freezer;
438 420
439 if (!_save_objects (freezer, flags)) 421 if (!_save_objects (freezer, flags))
… …
450 * map archetype. Mimic that behaviour. 432 * map archetype. Mimic that behaviour.
451 */ 433 */
452 width = 16; 434 width = 16;
453 height = 16; 435 height = 16;
454 timeout = 300; 436 timeout = 300;
455 max_nrof = 1000; // 1000 items of anything 437 max_items = MAX_ITEM_PER_ACTION;
456 max_volume = 2000000; // 2m³ 438 max_volume = 2000000; // 2m³
457} 439}
458 440
459maptile::maptile (int w, int h) 441maptile::maptile (int w, int h)
460{ 442{
… …
481 if (spaces) 463 if (spaces)
482 return; 464 return;
483 465
484 spaces = salloc0<mapspace> (size ()); 466 spaces = salloc0<mapspace> (size ());
485} 467}
468
469//+GPL
486 470
487/* Takes a string from a map definition and outputs a pointer to the array of shopitems 471/* Takes a string from a map definition and outputs a pointer to the array of shopitems
488 * corresponding to that string. Memory is allocated for this, it must be freed 472 * corresponding to that string. Memory is allocated for this, it must be freed
489 * at a later date. 473 * at a later date.
490 * Called by parse_map_headers below. 474 * Called by parse_map_headers below.
… …
567 return items; 551 return items;
568} 552}
569 553
570/* opposite of parse string, this puts the string that was originally fed in to 554/* opposite of parse string, this puts the string that was originally fed in to
571 * the map (or something equivilent) into output_string. */ 555 * the map (or something equivilent) into output_string. */
572static void 556static const char *
573print_shop_string (maptile *m, char *output_string) 557print_shop_string (maptile *m)
574{ 558{
575 int i; 559 static dynbuf_text buf; buf.clear ();
576 char tmp[MAX_BUF];
577 560
578 strcpy (output_string, "");
579 for (i = 0; i < m->shopitems[0].index; i++) 561 for (int i = 0; i < m->shopitems[0].index; i++)
580 { 562 {
581 if (m->shopitems[i].typenum) 563 if (m->shopitems[i].typenum)
582 { 564 {
583 if (m->shopitems[i].strength) 565 if (m->shopitems[i].strength)
584 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 566 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
585 else 567 else
586 sprintf (tmp, "%s;", m->shopitems[i].name); 568 buf.printf ("%s;", m->shopitems[i].name);
587 } 569 }
588 else 570 else
589 { 571 {
590 if (m->shopitems[i].strength) 572 if (m->shopitems[i].strength)
591 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 573 buf.printf ("*:%d;", m->shopitems[i].strength);
592 else 574 else
593 sprintf (tmp, "*"); 575 buf.printf ("*");
594 } 576 }
595
596 strcat (output_string, tmp);
597 } 577 }
578
579 return buf;
598} 580}
581
582//-GPL
599 583
600/* This loads the header information of the map. The header 584/* This loads the header information of the map. The header
601 * contains things like difficulty, size, timeout, etc. 585 * contains things like difficulty, size, timeout, etc.
602 * this used to be stored in the map object, but with the 586 * this used to be stored in the map object, but with the
603 * addition of tiling, fields beyond that easily named in an 587 * addition of tiling, fields beyond that easily named in an
… …
611bool 595bool
612maptile::_load_header (object_thawer &thawer) 596maptile::_load_header (object_thawer &thawer)
613{ 597{
614 for (;;) 598 for (;;)
615 { 599 {
616 thawer.next ();
617
618 switch (thawer.kw) 600 switch (thawer.kw)
619 { 601 {
620 case KW_msg: 602 case KW_msg:
621 thawer.get_ml (KW_endmsg, msg); 603 thawer.get_ml (KW_endmsg, msg);
622 break; 604 break;
… …
646 case KW_shopgreed: thawer.get (shopgreed); break; 628 case KW_shopgreed: thawer.get (shopgreed); break;
647 case KW_shopmin: thawer.get (shopmin); break; 629 case KW_shopmin: thawer.get (shopmin); break;
648 case KW_shopmax: thawer.get (shopmax); break; 630 case KW_shopmax: thawer.get (shopmax); break;
649 case KW_shoprace: thawer.get (shoprace); break; 631 case KW_shoprace: thawer.get (shoprace); break;
650 case KW_outdoor: thawer.get (outdoor); break; 632 case KW_outdoor: thawer.get (outdoor); break;
651 case KW_temp: thawer.get (temp); break;
652 case KW_pressure: thawer.get (pressure); break;
653 case KW_humid: thawer.get (humid); break;
654 case KW_windspeed: thawer.get (windspeed); break;
655 case KW_winddir: thawer.get (winddir); break;
656 case KW_sky: thawer.get (sky); break;
657 633
658 case KW_per_player: thawer.get (per_player); break; 634 case KW_per_player: thawer.get (per_player); break;
659 case KW_per_party: thawer.get (per_party); break; 635 case KW_per_party: thawer.get (per_party); break;
660 case KW_no_reset: thawer.get (no_reset); break; 636 case KW_no_reset: thawer.get (no_reset); break;
637 case KW_no_drop: thawer.get (no_drop); break;
661 638
662 case KW_region: default_region = region::find (thawer.get_str ()); break; 639 case KW_region: default_region = region::find (thawer.get_str ()); break;
663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 640 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
664 641
665 // old names new names 642 // old names new names
… …
677 case KW_tile_path_2: thawer.get (tile_path [1]); break; 654 case KW_tile_path_2: thawer.get (tile_path [1]); break;
678 case KW_tile_path_3: thawer.get (tile_path [2]); break; 655 case KW_tile_path_3: thawer.get (tile_path [2]); break;
679 case KW_tile_path_4: thawer.get (tile_path [3]); break; 656 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680 657
681 case KW_ERROR: 658 case KW_ERROR:
682 set_key (thawer.kw_str, thawer.value); 659 set_key_text (thawer.kw_str, thawer.value);
683 break; 660 break;
684 661
685 case KW_end: 662 case KW_end:
663 thawer.next ();
686 return true; 664 return true;
687 665
688 default: 666 default:
689 if (!thawer.parse_error ("map", 0)) 667 if (!thawer.parse_error ("map", 0))
690 return false; 668 return false;
691 break; 669 break;
692 } 670 }
671
672 thawer.next ();
693 } 673 }
694 674
695 abort (); 675 abort ();
696} 676}
697 677
698bool 678//+GPL
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}
708 679
709/****************************************************************************** 680/******************************************************************************
710 * This is the start of unique map handling code 681 * This is the start of unique map handling code
711 *****************************************************************************/ 682 *****************************************************************************/
712 683
… …
723 694
724 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 695 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
725 unique = 1; 696 unique = 1;
726 697
727 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 698 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
728 {
729 op->destroy_inv (false);
730 op->destroy (); 699 op->destroy ();
731 }
732 700
733 op = above; 701 op = above;
734 } 702 }
735 } 703 }
736} 704}
737 705
706//-GPL
707
738bool 708bool
739maptile::_save_header (object_freezer &freezer) 709maptile::_save_header (object_freezer &freezer)
740{ 710{
741#define MAP_OUT(k) freezer.put (KW_ ## k, k) 711#define MAP_OUT(k) freezer.put (KW(k), k)
742#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 712#define MAP_OUT2(k,v) freezer.put (KW(k), v)
743 713
744 MAP_OUT2 (arch, "map"); 714 MAP_OUT2 (arch, CS(map));
745 715
746 if (name) MAP_OUT (name); 716 if (name) MAP_OUT (name);
747 MAP_OUT (swap_time); 717 MAP_OUT (swap_time);
748 MAP_OUT (reset_time); 718 MAP_OUT (reset_time);
749 MAP_OUT (reset_timeout); 719 MAP_OUT (reset_timeout);
750 MAP_OUT (fixed_resettime); 720 MAP_OUT (fixed_resettime);
751 MAP_OUT (no_reset); 721 MAP_OUT (no_reset);
722 MAP_OUT (no_drop);
752 MAP_OUT (difficulty); 723 MAP_OUT (difficulty);
753
754 if (default_region) MAP_OUT2 (region, default_region->name); 724 if (default_region) MAP_OUT2 (region, default_region->name);
755 725
756 if (shopitems) 726 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
757 {
758 char shop[MAX_BUF];
759 print_shop_string (this, shop);
760 MAP_OUT2 (shopitems, shop);
761 }
762
763 MAP_OUT (shopgreed); 727 MAP_OUT (shopgreed);
764 MAP_OUT (shopmin); 728 MAP_OUT (shopmin);
765 MAP_OUT (shopmax); 729 MAP_OUT (shopmax);
766 if (shoprace) MAP_OUT (shoprace); 730 if (shoprace) MAP_OUT (shoprace);
767 MAP_OUT (darkness); 731
768 MAP_OUT (width); 732 MAP_OUT (width);
769 MAP_OUT (height); 733 MAP_OUT (height);
770 MAP_OUT (enter_x); 734 MAP_OUT (enter_x);
771 MAP_OUT (enter_y); 735 MAP_OUT (enter_y);
772 736 MAP_OUT (darkness);
773 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
774 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
775
776 MAP_OUT (outdoor); 737 MAP_OUT (outdoor);
777 MAP_OUT (temp); 738
778 MAP_OUT (pressure); 739 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
779 MAP_OUT (humid); 740 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
780 MAP_OUT (windspeed);
781 MAP_OUT (winddir);
782 MAP_OUT (sky);
783 741
784 MAP_OUT (per_player); 742 MAP_OUT (per_player);
785 MAP_OUT (per_party); 743 MAP_OUT (per_party);
786 744
787 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 745 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
788 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 746 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
789 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 747 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
790 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 748 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
791 749
792 freezer.put (this); 750 freezer.put (this);
793 freezer.put (KW_end); 751 freezer.put (KW(end));
794 752
795 return true; 753 return true;
796} 754}
797 755
798bool 756bool
… …
804 return false; 762 return false;
805 763
806 return freezer.save (path); 764 return freezer.save (path);
807} 765}
808 766
767//+GPL
768
809/* 769/*
810 * Remove and free all objects in the given map. 770 * Remove and free all objects in the given map.
811 */ 771 */
812void 772void
813maptile::clear () 773maptile::clear ()
814{ 774{
815 sfree (regions, size ()); regions = 0;
816 delete [] regionmap; regionmap = 0;
817
818 if (spaces) 775 if (spaces)
819 { 776 {
820 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 777 for (mapspace *ms = spaces + size (); ms-- > spaces; )
821 while (object *op = ms->bot) 778 while (object *op = ms->bot)
822 { 779 {
780 // manually remove, as to not trigger anything
781 if (ms->bot = op->above)
782 ms->bot->below = 0;
783
784 op->flag [FLAG_REMOVED] = true;
785
823 op = op->head_ (); 786 object *head = op->head_ ();
824 op->destroy_inv (false); 787 if (op == head)
825 op->destroy (); 788 op->destroy ();
789 else if (head->map != op->map)
790 {
791 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
792 head->destroy ();
793 }
826 } 794 }
827 795
828 sfree (spaces, size ()), spaces = 0; 796 sfree0 (spaces, size ());
829 } 797 }
830 798
831 if (buttons) 799 if (buttons)
832 free_objectlinkpt (buttons), buttons = 0; 800 free_objectlinkpt (buttons), buttons = 0;
801
802 sfree0 (regions, size ());
803 delete [] regionmap; regionmap = 0;
833} 804}
834 805
835void 806void
836maptile::clear_header () 807maptile::clear_header ()
837{ 808{
… …
870 841
871 clear (); 842 clear ();
872} 843}
873 844
874/* decay and destroy perishable items in a map */ 845/* decay and destroy perishable items in a map */
846// TODO: should be done regularly, not on map load?
875void 847void
876maptile::do_decay_objects () 848maptile::do_decay_objects ()
877{ 849{
878 if (!spaces) 850 if (!spaces)
879 return; 851 return;
… …
881 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 853 for (mapspace *ms = spaces + size (); ms-- > spaces; )
882 for (object *above, *op = ms->bot; op; op = above) 854 for (object *above, *op = ms->bot; op; op = above)
883 { 855 {
884 above = op->above; 856 above = op->above;
885 857
886 bool destroy = 0;
887
888 // do not decay anything above unique floor tiles (yet :) 858 // do not decay anything above unique floor tiles (yet :)
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 859 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890 break; 860 break;
891 861
862 bool destroy = 0;
863
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 864 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 865 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895 || QUERY_FLAG (op, FLAG_UNIQUE) 866 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 867 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID) 868 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ()) 869 || op->is_alive ())
899 ; // do not decay 870 ; // do not decay
… …
927 || mat & M_LIQUID 898 || mat & M_LIQUID
928 || (mat & M_IRON && rndm (1, 5) == 1) 899 || (mat & M_IRON && rndm (1, 5) == 1)
929 || (mat & M_GLASS && rndm (1, 2) == 1) 900 || (mat & M_GLASS && rndm (1, 2) == 1)
930 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 901 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
931 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 902 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
932 || (mat & M_ICE && temp > 32)) 903 //|| (mat & M_ICE && temp > 32)
904 )
933 destroy = 1; 905 destroy = 1;
934 } 906 }
935 907
936 /* adjust overall chance below */ 908 /* adjust overall chance below */
937 if (destroy && rndm (0, 1)) 909 if (destroy && rndm (0, 1))
938 op->destroy (); 910 op->destroy ();
939 }
940}
941
942/*
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 } 911 }
964} 912}
965 913
966/* 914/*
967 * This routine is supposed to find out the difficulty of the map. 915 * This routine is supposed to find out the difficulty of the map.
968 * difficulty does not have a lot to do with character level, 916 * difficulty does not have a lot to do with character level,
969 * but does have a lot to do with treasure on the map. 917 * but does have a lot to do with treasure on the map.
970 * 918 *
971 * Difficulty can now be set by the map creature. If the value stored 919 * 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 920 * in the map is zero, then use this routine. Maps should really
973 * have a difficulty set than using this function - human calculation 921 * have a difficulty set rather than using this function - human calculation
974 * is much better than this functions guesswork. 922 * is much better than this function's guesswork.
975 */ 923 */
976int 924int
977maptile::estimate_difficulty () const 925maptile::estimate_difficulty () const
978{ 926{
979 long monster_cnt = 0; 927 long monster_cnt = 0;
… …
991 939
992 if (QUERY_FLAG (op, FLAG_GENERATOR)) 940 if (QUERY_FLAG (op, FLAG_GENERATOR))
993 { 941 {
994 total_exp += op->stats.exp; 942 total_exp += op->stats.exp;
995 943
996 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 944 if (archetype *at = op->other_arch)
945 {
997 total_exp += at->stats.exp * 8; 946 total_exp += at->stats.exp * 8;
998
999 monster_cnt++; 947 monster_cnt++;
948 }
949
950 for (object *inv = op->inv; inv; inv = inv->below)
951 {
952 total_exp += op->stats.exp * 8;
953 monster_cnt++;
954 }
1000 } 955 }
1001 } 956 }
1002 957
1003 avgexp = (double) total_exp / monster_cnt; 958 avgexp = (double) total_exp / monster_cnt;
1004 959
… …
1017 * postive values make it darker, negative make it brighter 972 * postive values make it darker, negative make it brighter
1018 */ 973 */
1019int 974int
1020maptile::change_map_light (int change) 975maptile::change_map_light (int change)
1021{ 976{
1022 int new_level = darkness + change;
1023
1024 /* Nothing to do */ 977 /* Nothing to do */
1025 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 978 if (!change)
1026 return 0; 979 return 0;
1027 980
1028 /* inform all players on the map */ 981 /* inform all players on the map */
1029 if (change > 0) 982 if (change > 0)
1030 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 983 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1031 else 984 else
1032 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 985 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1033 986
1034 /* Do extra checking. since darkness is a unsigned value, 987 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 988
1046 /* All clients need to get re-updated for the change */ 989 /* All clients need to get re-updated for the change */
1047 update_all_map_los (this); 990 update_all_map_los (this);
991
1048 return 1; 992 return 1;
1049} 993}
1050 994
1051/* 995/*
1052 * This function updates various attributes about a specific space 996 * This function updates various attributes about a specific space
… …
1055 * through, etc) 999 * through, etc)
1056 */ 1000 */
1057void 1001void
1058mapspace::update_ () 1002mapspace::update_ ()
1059{ 1003{
1060 object *tmp, *last = 0; 1004 object *last = 0;
1061 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1005 uint8 flags = P_UPTODATE;
1006 sint8 light = 0;
1062 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1007 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1008 uint64_t volume = 0;
1009 uint32_t items = 0;
1010 object *anywhere = 0;
1011 uint8_t middle_visibility = 0;
1063 1012
1064 //object *middle = 0; 1013 //object *middle = 0;
1065 //object *top = 0; 1014 //object *top = 0;
1066 //object *floor = 0; 1015 //object *floor = 0;
1067 // this seems to generate better code than using locals, above 1016 // this seems to generate better code than using locals, above
1068 object *&top = faces_obj[0] = 0; 1017 object *&top = faces_obj[0] = 0;
1069 object *&middle = faces_obj[1] = 0; 1018 object *&middle = faces_obj[1] = 0;
1070 object *&floor = faces_obj[2] = 0; 1019 object *&floor = faces_obj[2] = 0;
1071 1020
1021 object::flags_t allflags; // all flags of all objects or'ed together
1022
1072 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1023 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1073 { 1024 {
1074 /* This could be made additive I guess (two lights better than 1025 // 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; 1026 light += tmp->glow_radius;
1081 1027
1082 /* This call is needed in order to update objects the player 1028 /* This call is needed in order to update objects the player
1083 * is standing in that have animations (ie, grass, fire, etc). 1029 * is standing in that have animations (ie, grass, fire, etc).
1084 * However, it also causes the look window to be re-drawn 1030 * However, it also causes the look window to be re-drawn
1085 * 3 times each time the player moves, because many of the 1031 * 3 times each time the player moves, because many of the
1086 * functions the move_player calls eventualy call this. 1032 * functions the move_player calls eventualy call this.
1087 * 1033 *
1088 * Always put the player down for drawing. 1034 * Always put the player down for drawing.
1089 */ 1035 */
1090 if (!tmp->invisible) 1036 if (expect_true (!tmp->invisible))
1091 { 1037 {
1092 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1038 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1093 top = tmp; 1039 top = tmp;
1094 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1040 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1095 { 1041 {
1096 /* If we got a floor, that means middle and top were below it, 1042 /* If we got a floor, that means middle and top were below it,
1097 * so should not be visible, so we clear them. 1043 * so should not be visible, so we clear them.
1098 */ 1044 */
1099 middle = 0; 1045 middle = 0;
1100 top = 0; 1046 top = 0;
1101 floor = tmp; 1047 floor = tmp;
1048 volume = 0;
1049 items = 0;
1102 } 1050 }
1103 /* Flag anywhere have high priority */ 1051 else
1104 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1105 { 1052 {
1053 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1054 {
1055 ++items;
1056 volume += tmp->volume ();
1057 }
1058
1059 /* Flag anywhere have high priority */
1060 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1061 anywhere = tmp;
1062
1063 /* Find the highest visible face around. If equal
1064 * visibilities, we still want the one nearer to the
1065 * top
1066 */
1067 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1068 {
1069 middle_visibility = ::faces [tmp->face].visibility;
1106 middle = tmp; 1070 middle = tmp;
1107 anywhere = 1; 1071 }
1108 } 1072 }
1109 /* Find the highest visible face around. If equal
1110 * visibilities, we still want the one nearer to the
1111 * top
1112 */
1113 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1114 middle = tmp;
1115 }
1116
1117 if (tmp == tmp->above)
1118 {
1119 LOG (llevError, "Error in structure of map\n");
1120 exit (-1);
1121 } 1073 }
1122 1074
1123 move_slow |= tmp->move_slow; 1075 move_slow |= tmp->move_slow;
1124 move_block |= tmp->move_block; 1076 move_block |= tmp->move_block;
1125 move_on |= tmp->move_on; 1077 move_on |= tmp->move_on;
1126 move_off |= tmp->move_off; 1078 move_off |= tmp->move_off;
1127 move_allow |= tmp->move_allow; 1079 move_allow |= tmp->move_allow;
1128 1080
1129 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1081 allflags |= tmp->flag;
1130 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1082
1131 if (tmp->type == PLAYER) flags |= P_PLAYER; 1083 if (tmp->type == PLAYER) flags |= P_PLAYER;
1132 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1084 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1133 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1134 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1135 } 1085 }
1136 1086
1137 this->light = light; 1087 // FLAG_SEE_ANYWHERE takes precedence
1088 if (anywhere)
1089 middle = anywhere;
1090
1091 // ORing all flags together and checking them here is much faster
1092 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1093 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1094 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1095 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1096
1097 this->light = min (light, MAX_LIGHT_RADIUS);
1138 this->flags_ = flags; 1098 this->flags_ = flags;
1139 this->move_block = move_block & ~move_allow; 1099 this->move_block = move_block & ~move_allow;
1140 this->move_on = move_on; 1100 this->move_on = move_on;
1141 this->move_off = move_off; 1101 this->move_off = move_off;
1142 this->move_slow = move_slow; 1102 this->move_slow = move_slow;
1103 this->volume_ = (volume + 1023) / 1024;
1104 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1143 1105
1144 /* At this point, we have a floor face (if there is a floor), 1106 /* At this point, we have a floor face (if there is a floor),
1145 * and the floor is set - we are not going to touch it at 1107 * and the floor is set - we are not going to touch it at
1146 * this point. 1108 * this point.
1147 * middle contains the highest visibility face. 1109 * middle contains the highest visibility face.
… …
1162 * 1) top face is set, need middle to be set. 1124 * 1) top face is set, need middle to be set.
1163 * 2) middle is set, need to set top. 1125 * 2) middle is set, need to set top.
1164 * 3) neither middle or top is set - need to set both. 1126 * 3) neither middle or top is set - need to set both.
1165 */ 1127 */
1166 1128
1167 for (tmp = last; tmp; tmp = tmp->below) 1129 for (object *tmp = last; tmp; tmp = tmp->below)
1168 { 1130 {
1169 /* Once we get to a floor, stop, since we already have a floor object */ 1131 /* Once we get to a floor, stop, since we already have a floor object */
1170 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1132 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1171 break; 1133 break;
1172 1134
… …
1213 faces_obj [1] = middle; 1175 faces_obj [1] = middle;
1214 faces_obj [2] = floor; 1176 faces_obj [2] = floor;
1215#endif 1177#endif
1216} 1178}
1217 1179
1218uint64 1180maptile *
1219mapspace::volume () const
1220{
1221 uint64 vol = 0;
1222
1223 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1224 vol += op->volume ();
1225
1226 return vol;
1227}
1228
1229bool
1230maptile::tile_available (int dir, bool load) 1181maptile::tile_available (int dir, bool load)
1231{ 1182{
1232 if (!tile_path[dir]) 1183 if (tile_path[dir])
1233 return 0; 1184 {
1234
1235 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1185 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1236 return 1; 1186 return tile_map[dir];
1237 1187
1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1188 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1239 return 1; 1189 return tile_map[dir];
1190 }
1240 1191
1241 return 0; 1192 return 0;
1242} 1193}
1243 1194
1244/* this returns TRUE if the coordinates (x,y) are out of 1195/* this returns TRUE if the coordinates (x,y) are out of
… …
1550 else 1501 else
1551 { 1502 {
1552 retval->distance_x += op2->x - x; 1503 retval->distance_x += op2->x - x;
1553 retval->distance_y += op2->y - y; 1504 retval->distance_y += op2->y - y;
1554 1505
1555 retval->part = NULL; 1506 retval->part = 0;
1556 retval->distance = idistance (retval->distance_x, retval->distance_y); 1507 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1557 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1508 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1558 } 1509 }
1559} 1510}
1560 1511
1561/* Returns true of op1 and op2 are effectively on the same map 1512/* Returns true of op1 and op2 are effectively on the same map
… …
1572 int dx, dy; 1523 int dx, dy;
1573 1524
1574 return adjacent_map (op1->map, op2->map, &dx, &dy); 1525 return adjacent_map (op1->map, op2->map, &dx, &dy);
1575} 1526}
1576 1527
1528//-GPL
1529
1577object * 1530object *
1578maptile::insert (object *op, int x, int y, object *originator, int flags) 1531maptile::insert (object *op, int x, int y, object *originator, int flags)
1579{ 1532{
1580 if (!op->flag [FLAG_REMOVED])
1581 op->remove ();
1582
1583 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1533 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1584} 1534}
1585 1535
1586region * 1536region *
1587maptile::region (int x, int y) const 1537maptile::region (int x, int y) const
… …
1596 return default_region; 1546 return default_region;
1597 1547
1598 return ::region::default_region (); 1548 return ::region::default_region ();
1599} 1549}
1600 1550
1551//+GPL
1552
1601/* picks a random object from a style map. 1553/* 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 */ 1554 */
1605object * 1555object *
1606maptile::pick_random_object () const 1556maptile::pick_random_object (rand_gen &gen) const
1607{ 1557{
1608 /* while returning a null object will result in a crash, that 1558 /* while returning a null object will result in a crash, that
1609 * is actually preferable to an infinite loop. That is because 1559 * is actually preferable to an infinite loop. That is because
1610 * most servers will automatically restart in case of crash. 1560 * most servers will automatically restart in case of crash.
1611 * Change the logic on getting the random space - shouldn't make 1561 * Change the logic on getting the random space - shouldn't make
1612 * any difference, but this seems clearer to me. 1562 * any difference, but this seems clearer to me.
1613 */ 1563 */
1614 for (int i = 1000; --i;) 1564 for (int i = 1000; --i;)
1615 { 1565 {
1616 object *pick = at (rndm (width), rndm (height)).bot; 1566 object *pick = at (gen (width), gen (height)).bot;
1617 1567
1618 // do not prefer big monsters just because they are big. 1568 // do not prefer big monsters just because they are big.
1619 if (pick && pick->head_ () == pick) 1569 if (pick && pick->is_head ())
1620 return pick->head_ (); 1570 return pick->head_ ();
1621 } 1571 }
1622 1572
1623 // instead of crashing in the unlikely(?) case, try to return *something* 1573 // instead of crashing in the unlikely(?) case, try to return *something*
1624 return get_archetype ("blocked"); 1574 return archetype::find (shstr_bug);
1625} 1575}
1576
1577//-GPL
1626 1578
1627void 1579void
1628maptile::play_sound (faceidx sound, int x, int y) const 1580maptile::play_sound (faceidx sound, int x, int y) const
1629{ 1581{
1630 if (!sound) 1582 if (!sound)
1631 return; 1583 return;
1632 1584
1585 for_all_players_on_map (pl, this)
1586 if (client *ns = pl->ns)
1587 {
1588 int dx = x - pl->ob->x;
1589 int dy = y - pl->ob->y;
1590
1591 int distance = idistance (dx, dy);
1592
1593 if (distance <= MAX_SOUND_DISTANCE)
1594 ns->play_sound (sound, dx, dy);
1595 }
1596}
1597
1598void
1599maptile::say_msg (const char *msg, int x, int y) const
1600{
1633 for_all_players (pl) 1601 for_all_players (pl)
1634 if (pl->ob->map == this)
1635 if (client *ns = pl->ns) 1602 if (client *ns = pl->ns)
1636 { 1603 {
1637 int dx = x - pl->ob->x; 1604 int dx = x - pl->ob->x;
1638 int dy = y - pl->ob->y; 1605 int dy = y - pl->ob->y;
1639 1606
1640 int distance = idistance (dx, dy); 1607 int distance = idistance (dx, dy);
1641 1608
1642 if (distance <= MAX_SOUND_DISTANCE) 1609 if (distance <= MAX_SOUND_DISTANCE)
1643 ns->play_sound (sound, dx, dy); 1610 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1644 } 1611 }
1645} 1612}
1646 1613
1614static void
1615split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1616{
1617 // clip to map to the left
1618 if (x0 < 0)
1619 {
1620 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1621 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1622
1623 if (x1 < 0) // entirely to the left
1624 return;
1625
1626 x0 = 0;
1627 }
1628
1629 // clip to map to the right
1630 if (x1 > m->width)
1631 {
1632 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1633 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1634
1635 if (x0 > m->width) // entirely to the right
1636 return;
1637
1638 x1 = m->width;
1639 }
1640
1641 // clip to map above
1642 if (y0 < 0)
1643 {
1644 if (maptile *tile = m->tile_available (TILE_UP, 1))
1645 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1646
1647 if (y1 < 0) // entirely above
1648 return;
1649
1650 y0 = 0;
1651 }
1652
1653 // clip to map below
1654 if (y1 > m->height)
1655 {
1656 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1657 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1658
1659 if (y0 > m->height) // entirely below
1660 return;
1661
1662 y1 = m->height;
1663 }
1664
1665 // if we get here, the rect is within the current map
1666 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1667
1668 r->m = m;
1669 r->x0 = x0;
1670 r->y0 = y0;
1671 r->x1 = x1;
1672 r->y1 = y1;
1673 r->dx = dx;
1674 r->dy = dy;
1675}
1676
1677maprect *
1678maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1679{
1680 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1681 buf.clear ();
1682
1683 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1684
1685 // add end marker
1686 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1687 r->m = 0;
1688
1689 return (maprect *)buf.linearise ();
1690}
1691

Diff Legend

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